Mojo: MOJO_OVERRIDE -> override in mojo/.

mojo/services/window_manager/window_manager_api_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/memory/scoped_vector.h"
 #include "mojo/application_manager/application_manager.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
@@ skipping 47 matching lines @@
 
   void set_focus_changed_callback(const TwoNodeCallback& callback) {
     focus_changed_callback_ = callback;
   }
   void set_active_window_changed_callback(const TwoNodeCallback& callback) {
     active_window_changed_callback_ = callback;
   }
 
  private:
   // Overridden from WindowManagerClient:
-  virtual void OnWindowManagerReady() MOJO_OVERRIDE {
-    run_loop_->Quit();
-  }
-  virtual void OnCaptureChanged(
-      Id old_capture_node_id,
-      Id new_capture_node_id) MOJO_OVERRIDE {
-  }
-  virtual void OnFocusChanged(
-      Id old_focused_node_id,
-      Id new_focused_node_id) MOJO_OVERRIDE {
+  virtual void OnWindowManagerReady() override { run_loop_->Quit(); }
+  virtual void OnCaptureChanged(Id old_capture_node_id,
+                                Id new_capture_node_id) override {}
+  virtual void OnFocusChanged(Id old_focused_node_id,
+                              Id new_focused_node_id) override {
     if (!focus_changed_callback_.is_null())
       focus_changed_callback_.Run(old_focused_node_id, new_focused_node_id);
   }
-  virtual void OnActiveWindowChanged(
-      Id old_active_window,
-      Id new_active_window) MOJO_OVERRIDE {
+  virtual void OnActiveWindowChanged(Id old_active_window,
+                                     Id new_active_window) override {
     if (!active_window_changed_callback_.is_null())
       active_window_changed_callback_.Run(old_active_window, new_active_window);
   }
 
   base::RunLoop* run_loop_;
   TwoNodeCallback focus_changed_callback_;
   TwoNodeCallback active_window_changed_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWindowManagerClient);
 };
 
 class TestApplicationLoader : public ApplicationLoader,
                               public ApplicationDelegate,
                               public ViewManagerDelegate {
  public:
   typedef base::Callback<void(View*)> RootAddedCallback;
 
   explicit TestApplicationLoader(const RootAddedCallback& root_added_callback)
       : root_added_callback_(root_added_callback) {}
   virtual ~TestApplicationLoader() {}
 
  private:
   // Overridden from ApplicationLoader:
   virtual void Load(ApplicationManager* application_manager,
                     const GURL& url,
-                    scoped_refptr<LoadCallbacks> callbacks) MOJO_OVERRIDE {
+                    scoped_refptr<LoadCallbacks> callbacks) override {
     ScopedMessagePipeHandle shell_handle = callbacks->RegisterApplication();
     if (!shell_handle.is_valid())
       return;
     scoped_ptr<ApplicationImpl> app(
         new ApplicationImpl(this, shell_handle.Pass()));
     apps_.push_back(app.release());
   }
   virtual void OnApplicationError(ApplicationManager* application_manager,
-                                  const GURL& url) MOJO_OVERRIDE {}
+                                  const GURL& url) override {}
 
   // Overridden from ApplicationDelegate:
-  virtual void Initialize(ApplicationImpl* app) MOJO_OVERRIDE {
+  virtual void Initialize(ApplicationImpl* app) override {
     view_manager_client_factory_.reset(
         new ViewManagerClientFactory(app->shell(), this));
   }
 
   virtual bool ConfigureIncomingConnection(
-      ApplicationConnection* connection) MOJO_OVERRIDE {
+      ApplicationConnection* connection) override {
     connection->AddService(view_manager_client_factory_.get());
     return true;
   }
 
   // Overridden from ViewManagerDelegate:
-  virtual void OnEmbed(
-      ViewManager* view_manager,
-      View* root,
-      ServiceProviderImpl* exported_services,
-      scoped_ptr<ServiceProvider> imported_services) MOJO_OVERRIDE {
+  virtual void OnEmbed(ViewManager* view_manager,
+                       View* root,
+                       ServiceProviderImpl* exported_services,
+                       scoped_ptr<ServiceProvider> imported_services) override {
     root_added_callback_.Run(root);
   }
-  virtual void OnViewManagerDisconnected(
-      ViewManager* view_manager) MOJO_OVERRIDE {
-  }
+  virtual void OnViewManagerDisconnected(ViewManager* view_manager) override {}
 
   RootAddedCallback root_added_callback_;
 
   ScopedVector<ApplicationImpl> apps_;
   scoped_ptr<ViewManagerClientFactory> view_manager_client_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TestApplicationLoader);
 };
 
 }  // namespace
@@ skipping 45 matching lines @@
   }
 
   TestWindowManagerClient* window_manager_client() {
     return window_manager_client_.get();
   }
 
   WindowManagerServicePtr window_manager_;
 
  private:
   // Overridden from testing::Test:
-  virtual void SetUp() MOJO_OVERRIDE {
+  virtual void SetUp() override {
     test_helper_.Init();
     test_helper_.SetLoaderForURL(
         scoped_ptr<ApplicationLoader>(new TestApplicationLoader(base::Bind(
             &WindowManagerApiTest::OnRootAdded, base::Unretained(this)))),
         GURL(kTestServiceURL));
     test_helper_.application_manager()->ConnectToService(
         GURL("mojo:mojo_view_manager"), &view_manager_init_);
     ASSERT_TRUE(InitEmbed(view_manager_init_.get(),
                           "mojo:mojo_core_window_manager"));
     ConnectToWindowManager();
   }
-  virtual void TearDown() MOJO_OVERRIDE {}
+  virtual void TearDown() override {}
 
   void ConnectToWindowManager() {
     test_helper_.application_manager()->ConnectToService(
         GURL("mojo:mojo_core_window_manager"), &window_manager_);
     base::RunLoop connect_loop;
     window_manager_client_.reset(new TestWindowManagerClient(&connect_loop));
     window_manager_.set_client(window_manager_client());
     connect_loop.Run();
   }
 
@@ skipping 47 matching lines @@
 
   Id second_window = OpenWindow();
   window_manager_->ActivateWindow(second_window,
                                   base::Bind(&EmptyResultCallback));
   ids = WaitForActiveWindowChange();
   EXPECT_EQ(ids.first, first_window);
   EXPECT_EQ(ids.second, second_window);
 }
 
 }  // namespace mojo