replace OVERRIDE and FINAL with override and final in mojo/

mojo/services/public/cpp/view_manager/tests/view_manager_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 "mojo/services/public/cpp/view_manager/view_manager.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "mojo/application_manager/application_manager.h"
@@ skipping 43 matching lines @@
  private:
   // Overridden from ApplicationDelegate:
   virtual void Initialize(ApplicationImpl* app) override {
     view_manager_client_factory_.reset(
         new ViewManagerClientFactory(app->shell(), this));
   }
 
   // Overridden from ApplicationLoader:
   virtual void Load(ApplicationManager* manager,
                     const GURL& url,
-                    scoped_refptr<LoadCallbacks> callbacks) 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* manager,
-                                  const GURL& url) OVERRIDE {}
+                                  const GURL& url) override {}
 
   virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
-      OVERRIDE {
+      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) OVERRIDE {
+                       scoped_ptr<ServiceProvider> imported_services) override {
     callback_.Run(view_manager, root);
   }
-  virtual void OnViewManagerDisconnected(ViewManager* view_manager) OVERRIDE {}
+  virtual void OnViewManagerDisconnected(ViewManager* view_manager) override {}
 
   ScopedVector<ApplicationImpl> apps_;
   LoadedCallback callback_;
   scoped_ptr<ViewManagerClientFactory> view_manager_client_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectApplicationLoader);
 };
 
 class BoundsChangeObserver : public ViewObserver {
  public:
   explicit BoundsChangeObserver(View* view) : view_(view) {}
   virtual ~BoundsChangeObserver() {}
 
  private:
   // Overridden from ViewObserver:
   virtual void OnViewBoundsChanged(View* view,
                                    const gfx::Rect& old_bounds,
-                                   const gfx::Rect& new_bounds) OVERRIDE {
+                                   const gfx::Rect& new_bounds) override {
     DCHECK_EQ(view, view_);
     QuitRunLoop();
   }
 
   View* view_;
 
   DISALLOW_COPY_AND_ASSIGN(BoundsChangeObserver);
 };
 
 // Wait until the bounds of the supplied view change.
@@ skipping 12 matching lines @@
       : tree_(tree),
         tree_size_(tree_size) {}
   virtual ~TreeSizeMatchesObserver() {}
 
   bool IsTreeCorrectSize() {
     return CountViews(tree_) == tree_size_;
   }
 
  private:
   // Overridden from ViewObserver:
-  virtual void OnTreeChanged(const TreeChangeParams& params) OVERRIDE {
+  virtual void OnTreeChanged(const TreeChangeParams& params) override {
     if (IsTreeCorrectSize())
       QuitRunLoop();
   }
 
   size_t CountViews(const View* view) const {
     size_t count = 1;
     View::Children::const_iterator it = view->children().begin();
     for (; it != view->children().end(); ++it)
       count += CountViews(*it);
     return count;
@@ skipping 16 matching lines @@
 
 // Utility class that waits for the destruction of some number of views and
 // views.
 class DestructionObserver : public ViewObserver {
  public:
   // |views| or |views| can be NULL.
   explicit DestructionObserver(std::set<Id>* views) : views_(views) {}
 
  private:
   // Overridden from ViewObserver:
-  virtual void OnViewDestroyed(View* view) OVERRIDE {
+  virtual void OnViewDestroyed(View* view) override {
     std::set<Id>::iterator it = views_->find(view->id());
     if (it != views_->end())
       views_->erase(it);
     if (CanQuit())
       QuitRunLoop();
   }
 
   bool CanQuit() {
     return !views_ || views_->empty();
   }
@@ skipping 21 matching lines @@
     view_->AddObserver(this);
   }
   virtual ~OrderChangeObserver() {
     view_->RemoveObserver(this);
   }
 
  private:
   // Overridden from ViewObserver:
   virtual void OnViewReordered(View* view,
                                View* relative_view,
-                               OrderDirection direction) OVERRIDE {
+                               OrderDirection direction) override {
     DCHECK_EQ(view, view_);
     QuitRunLoop();
   }
 
   View* view_;
 
   DISALLOW_COPY_AND_ASSIGN(OrderChangeObserver);
 };
 
 void WaitForOrderChange(ViewManager* view_manager, View* view) {
   OrderChangeObserver observer(view);
   DoRunLoop();
 }
 
 // Tracks a view's destruction. Query is_valid() for current state.
 class ViewTracker : public ViewObserver {
  public:
   explicit ViewTracker(View* view) : view_(view) {
     view_->AddObserver(this);
   }
   virtual ~ViewTracker() {
     if (view_)
       view_->RemoveObserver(this);
   }
 
   bool is_valid() const { return !!view_; }
 
  private:
   // Overridden from ViewObserver:
-  virtual void OnViewDestroyed(View* view) OVERRIDE {
+  virtual void OnViewDestroyed(View* view) override {
     DCHECK_EQ(view, view_);
     view_ = NULL;
   }
 
   int id_;
   View* view_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewTracker);
 };
 
@@ skipping 35 matching lines @@
     loaded_view_manager_ = NULL;
     return view_manager;
   }
 
   void UnloadApplication(const GURL& url) {
     test_helper_.SetLoaderForURL(scoped_ptr<ApplicationLoader>(), url);
   }
 
  private:
   // Overridden from testing::Test:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ConnectApplicationLoader::LoadedCallback ready_callback = base::Bind(
         &ViewManagerTest::OnViewManagerLoaded, base::Unretained(this));
     test_helper_.Init();
     test_helper_.SetLoaderForURL(
         scoped_ptr<ApplicationLoader>(
             new ConnectApplicationLoader(ready_callback)),
         GURL(kWindowManagerURL));
     test_helper_.SetLoaderForURL(
         scoped_ptr<ApplicationLoader>(
             new ConnectApplicationLoader(ready_callback)),
@@ skipping 216 matching lines @@
 
 class VisibilityChangeObserver : public ViewObserver {
  public:
   explicit VisibilityChangeObserver(View* view) : view_(view) {
     view_->AddObserver(this);
   }
   virtual ~VisibilityChangeObserver() { view_->RemoveObserver(this); }
 
  private:
   // Overridden from ViewObserver:
-  virtual void OnViewVisibilityChanged(View* view) OVERRIDE {
+  virtual void OnViewVisibilityChanged(View* view) override {
     EXPECT_EQ(view, view_);
     QuitRunLoop();
   }
 
   View* view_;
 
   DISALLOW_COPY_AND_ASSIGN(VisibilityChangeObserver);
 };
 
 }  // namespace
@@ skipping 41 matching lines @@
 
 class DrawnChangeObserver : public ViewObserver {
  public:
   explicit DrawnChangeObserver(View* view) : view_(view) {
     view_->AddObserver(this);
   }
   virtual ~DrawnChangeObserver() { view_->RemoveObserver(this); }
 
  private:
   // Overridden from ViewObserver:
-  virtual void OnViewDrawnChanged(View* view) OVERRIDE {
+  virtual void OnViewDrawnChanged(View* view) override {
     EXPECT_EQ(view, view_);
     QuitRunLoop();
   }
 
   View* view_;
 
   DISALLOW_COPY_AND_ASSIGN(DrawnChangeObserver);
 };
 
 }  // namespace
@@ skipping 26 matching lines @@
 
 // TODO(beng): tests for view event dispatcher.
 // - verify that we see events for all views.
 
 // TODO(beng): tests for focus:
 // - focus between two views known to a connection
 // - focus between views unknown to one of the connections.
 // - focus between views unknown to either connection.
 
 }  // namespace mojo