replace OVERRIDE and FINAL with override and final in ash/

ash/wm/workspace_controller_unittest.cc

 // Copyright 2013 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 "ash/wm/workspace_controller.h"
 
 #include <map>
 
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
@@ skipping 629 matching lines @@
 // WindowDelegate used by DontCrashOnChangeAndActivate.
 class DontCrashOnChangeAndActivateDelegate
     : public aura::test::TestWindowDelegate {
  public:
   DontCrashOnChangeAndActivateDelegate() : window_(NULL) {}
 
   void set_window(aura::Window* window) { window_ = window; }
 
   // WindowDelegate overrides:
   virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
-                               const gfx::Rect& new_bounds) OVERRIDE {
+                               const gfx::Rect& new_bounds) override {
     if (window_) {
       wm::ActivateWindow(window_);
       window_ = NULL;
     }
   }
 
  private:
   aura::Window* window_;
 
   DISALLOW_COPY_AND_ASSIGN(DontCrashOnChangeAndActivateDelegate);
@@ skipping 662 matching lines @@
   // Number of times OnWindowHierarchyChanged() has been received.
   void clear_change_count() { change_count_ = 0; }
   int change_count() const {
     return change_count_;
   }
 
   // aura::WindowObserver overrides:
   // Counts number of times a window is reparented. Ignores reparenting into and
   // from a docked container which is expected when a tab is dragged.
   virtual void OnWindowHierarchyChanged(
-      const HierarchyChangeParams& params) OVERRIDE {
+      const HierarchyChangeParams& params) override {
     if (params.target != window_ ||
         (params.old_parent->id() == kShellWindowId_DefaultContainer &&
          params.new_parent->id() == kShellWindowId_DockedContainer) ||
         (params.old_parent->id() == kShellWindowId_DockedContainer &&
          params.new_parent->id() == kShellWindowId_DefaultContainer)) {
       return;
     }
     change_count_++;
   }
 
@@ skipping 265 matching lines @@
                          ui::EventTimeForNow());
     target = targeter->FindTargetForEvent(root, &touch);
     if (points[i].is_target_hit)
       EXPECT_EQ(window.get(), target);
     else
       EXPECT_NE(window.get(), target);
   }
 }
 
 }  // namespace ash