commit 32952271830d417e7ae98b08aecc0f0760648a37
author Viet-Trung Luu <viettrungluu@chromium.org> Wed Feb 11 16:32:03 2015 -0800
committer Viet-Trung Luu <viettrungluu@chromium.org> Wed Feb 11 16:32:03 2015 -0800
tree 924c39dd59df378f072d5a222cafb8161225692a
parent 1cbbc7e44409407d59d3c983ee2fe8f154dacd68

clang-format //shell and add a PRESUBMIT.py to keep it clang-formatted.

(One day, once everything is clang-formatted, we'll just add that check
to the root PRESUBMIT.py. Directories like //base remain problematic for
now though.)

R=jamesr@chromium.org

Review URL: https://codereview.chromium.org/866283007

shell/application_manager/application_manager_unittest.cc

diff --git a/shell/application_manager/application_manager_unittest.cc b/shell/application_manager/application_manager_unittest.cc
index 5c3b285..0481e74 100644
--- a/shell/application_manager/application_manager_unittest.cc
+++ b/shell/application_manager/application_manager_unittest.cc
@@ -390,12 +390,10 @@
 
 class TestDelegate : public ApplicationManager::Delegate {
  public:
-  void AddMapping(const GURL& from, const GURL& to) {
-    mappings_[from] = to;
-  }
+  void AddMapping(const GURL& from, const GURL& to) { mappings_[from] = to; }
 
   // ApplicationManager::Delegate
-  virtual GURL ResolveMappings(const GURL& url) override {
+  GURL ResolveMappings(const GURL& url) override {
     auto it = mappings_.find(url);
     if (it != mappings_.end())
       return it->second;
@@ -403,7 +401,7 @@
   }
 
   // ApplicationManager::Delegate
-  virtual GURL ResolveURL(const GURL& url) override {
+  GURL ResolveURL(const GURL& url) override {
     GURL mapped_url = ResolveMappings(url);
     // The shell automatically map mojo URLs.
     if (mapped_url.scheme() == "mojo") {
@@ -414,8 +412,7 @@
     return mapped_url;
   }
 
-  virtual void OnApplicationError(const GURL& url) override {
-  }
+  void OnApplicationError(const GURL& url) override {}
 
  private:
   std::map<GURL, GURL> mappings_;
@@ -425,13 +422,12 @@
  public:
   TestExternal() : configure_incoming_connection_called_(false) {}
 
-  virtual void Initialize(ApplicationImpl* app) override {
+  void Initialize(ApplicationImpl* app) override {
     initialize_args_ = app->args();
     base::MessageLoop::current()->Quit();
   }
 
-  virtual bool ConfigureIncomingConnection(
-      ApplicationConnection* connection) override {
+  bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
     configure_incoming_connection_called_ = true;
     base::MessageLoop::current()->Quit();
     return true;
@@ -741,8 +737,8 @@
                                                     application.Pass());
   loop_.Run();
   EXPECT_EQ(args, external.initialize_args());
-  application_manager_->ConnectToServiceByName(
-      GURL("mojo:test"), std::string());
+  application_manager_->ConnectToServiceByName(GURL("mojo:test"),
+                                               std::string());
   loop_.Run();
   EXPECT_TRUE(external.configure_incoming_connection_called());
 };