Mojo: Convert OVERRIDE -> override in various subdirectories of mojo/.

mojo/application_manager/application_manager_unittest.cc

Index: mojo/application_manager/application_manager_unittest.cc
diff --git a/mojo/application_manager/application_manager_unittest.cc b/mojo/application_manager/application_manager_unittest.cc
index 658b6700e2c4804c8da719070aefd4b3a2fef024..5763265f37939aace9b3480fab502b05cc45a8a0 100644
--- a/mojo/application_manager/application_manager_unittest.cc
+++ b/mojo/application_manager/application_manager_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "base/at_exit.h"
 #include "base/bind.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/application_manager/application_loader.h"
 #include "mojo/application_manager/application_manager.h"
@@ -36,7 +37,7 @@ class QuitMessageLoopErrorHandler : public ErrorHandler {
   virtual ~QuitMessageLoopErrorHandler() {}
 
   // |ErrorHandler| implementation:
-  virtual void OnConnectionError() OVERRIDE {
+  virtual void OnConnectionError() override {
     base::MessageLoop::current()->QuitWhenIdle();
   }
 
@@ -52,14 +53,14 @@ class TestServiceImpl : public InterfaceImpl<TestService> {
 
   virtual ~TestServiceImpl() { --context_->num_impls; }
 
-  virtual void OnConnectionError() OVERRIDE {
+  virtual void OnConnectionError() override {
     if (!base::MessageLoop::current()->is_running())
       return;
     base::MessageLoop::current()->Quit();
   }
 
   // TestService implementation:
-  virtual void Test(const String& test_string) OVERRIDE {
+  virtual void Test(const String& test_string) override {
     context_->last_test_string = test_string;
     client()->AckTest();
   }
@@ -77,7 +78,7 @@ class TestClientImpl : public TestClient {
 
   virtual ~TestClientImpl() { service_.reset(); }
 
-  virtual void AckTest() OVERRIDE {
+  virtual void AckTest() override {
     if (quit_after_ack_)
       base::MessageLoop::current()->Quit();
   }
@@ -115,25 +116,25 @@ class TestApplicationLoader : public ApplicationLoader,
   // ApplicationLoader implementation.
   virtual void Load(ApplicationManager* manager,
                     const GURL& url,
-                    scoped_refptr<LoadCallbacks> callbacks) OVERRIDE {
+                    scoped_refptr<LoadCallbacks> callbacks) override {
     ++num_loads_;
     test_app_.reset(
         new ApplicationImpl(this, callbacks->RegisterApplication().Pass()));
   }
 
   virtual void OnApplicationError(ApplicationManager* manager,
-                                  const GURL& url) OVERRIDE {}
+                                  const GURL& url) override {}
 
   // ApplicationDelegate implementation.
   virtual bool ConfigureIncomingConnection(
-      ApplicationConnection* connection) OVERRIDE {
+      ApplicationConnection* connection) override {
     connection->AddService(this);
     return true;
   }
 
   // InterfaceFactory implementation.
   virtual void Create(ApplicationConnection* connection,
-                      InterfaceRequest<TestService> request) OVERRIDE {
+                      InterfaceRequest<TestService> request) override {
     BindToRequest(new TestServiceImpl(context_), &request);
   }
 
@@ -252,11 +253,11 @@ class TestAImpl : public InterfaceImpl<TestA> {
   }
 
  private:
-  virtual void CallB() OVERRIDE {
+  virtual void CallB() override {
     b_->B(base::Bind(&TestAImpl::Quit, base::Unretained(this)));
   }
 
-  virtual void CallCFromB() OVERRIDE {
+  virtual void CallCFromB() override {
     b_->CallC(base::Bind(&TestAImpl::Quit, base::Unretained(this)));
   }
 
@@ -285,12 +286,12 @@ class TestBImpl : public InterfaceImpl<TestB> {
   }
 
  private:
-  virtual void B(const mojo::Callback<void()>& callback) OVERRIDE {
+  virtual void B(const mojo::Callback<void()>& callback) override {
     test_context_->IncrementNumBCalls();
     callback.Run();
   }
 
-  virtual void CallC(const mojo::Callback<void()>& callback) OVERRIDE {
+  virtual void CallC(const mojo::Callback<void()>& callback) override {
     test_context_->IncrementNumBCalls();
     c_->C(callback);
   }
@@ -307,7 +308,7 @@ class TestCImpl : public InterfaceImpl<TestC> {
   virtual ~TestCImpl() { test_context_->IncrementNumCDeletes(); }
 
  private:
-  virtual void C(const mojo::Callback<void()>& callback) OVERRIDE {
+  virtual void C(const mojo::Callback<void()>& callback) override {
     test_context_->IncrementNumCCalls();
     callback.Run();
   }
@@ -327,16 +328,16 @@ class Tester : public ApplicationDelegate,
  private:
   virtual void Load(ApplicationManager* manager,
                     const GURL& url,
-                    scoped_refptr<LoadCallbacks> callbacks) OVERRIDE {
+                    scoped_refptr<LoadCallbacks> callbacks) override {
     app_.reset(
         new ApplicationImpl(this, callbacks->RegisterApplication().Pass()));
   }
 
   virtual void OnApplicationError(ApplicationManager* manager,
-                                  const GURL& url) OVERRIDE {}
+                                  const GURL& url) override {}
 
   virtual bool ConfigureIncomingConnection(
-      ApplicationConnection* connection) OVERRIDE {
+      ApplicationConnection* connection) override {
     if (!requestor_url_.empty() &&
         requestor_url_ != connection->GetRemoteApplicationURL()) {
       context_->set_tester_called_quit();
@@ -353,7 +354,7 @@ class Tester : public ApplicationDelegate,
   }
 
   virtual bool ConfigureOutgoingConnection(
-      ApplicationConnection* connection) OVERRIDE {
+      ApplicationConnection* connection) override {
     // If we're connecting to B, then add C.
     if (connection->GetRemoteApplicationURL() == kTestBURLString)
       connection->AddService<TestC>(this);
@@ -361,17 +362,17 @@ class Tester : public ApplicationDelegate,
   }
 
   virtual void Create(ApplicationConnection* connection,
-                      InterfaceRequest<TestA> request) OVERRIDE {
+                      InterfaceRequest<TestA> request) override {
     BindToRequest(new TestAImpl(connection, context_), &request);
   }
 
   virtual void Create(ApplicationConnection* connection,
-                      InterfaceRequest<TestB> request) OVERRIDE {
+                      InterfaceRequest<TestB> request) override {
     BindToRequest(new TestBImpl(connection, context_), &request);
   }
 
   virtual void Create(ApplicationConnection* connection,
-                      InterfaceRequest<TestC> request) OVERRIDE {
+                      InterfaceRequest<TestC> request) override {
     BindToRequest(new TestCImpl(connection, context_), &request);
   }
 
@@ -386,7 +387,7 @@ class TestServiceInterceptor : public ApplicationManager::Interceptor {
 
   virtual ServiceProviderPtr OnConnectToClient(
       const GURL& url,
-      ServiceProviderPtr service_provider) OVERRIDE {
+      ServiceProviderPtr service_provider) override {
     ++call_count_;
     url_ = url;
     return service_provider.Pass();
@@ -414,7 +415,7 @@ class ApplicationManagerTest : public testing::Test {
 
   virtual ~ApplicationManagerTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     application_manager_.reset(new ApplicationManager);
     TestApplicationLoader* default_loader = new TestApplicationLoader;
     default_loader->set_context(&context_);
@@ -427,7 +428,7 @@ class ApplicationManagerTest : public testing::Test {
     test_client_.reset(new TestClientImpl(service_proxy.Pass()));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     test_client_.reset(NULL);
     application_manager_.reset(NULL);
   }