Replacing the OVERRIDE with override and FINAL with final in content/browser/[accessibility|battery…

content/browser/accessibility/browser_accessibility_manager_unittest.cc

 // Copyright (c) 2012 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/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/accessibility/browser_accessibility.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #if defined(OS_WIN)
 #include "content/browser/accessibility/browser_accessibility_win.h"
 #endif
 #include "content/common/accessibility_messages.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 namespace {
 
 // Subclass of BrowserAccessibility that counts the number of instances.
 class CountedBrowserAccessibility : public BrowserAccessibility {
  public:
   CountedBrowserAccessibility() {
     global_obj_count_++;
     native_ref_count_ = 1;
   }
   virtual ~CountedBrowserAccessibility() {
     global_obj_count_--;
   }
 
-  virtual void NativeAddReference() OVERRIDE {
+  virtual void NativeAddReference() override {
     native_ref_count_++;
   }
 
-  virtual void NativeReleaseReference() OVERRIDE {
+  virtual void NativeReleaseReference() override {
     native_ref_count_--;
     if (native_ref_count_ == 0)
       delete this;
   }
 
   int native_ref_count_;
   static int global_obj_count_;
 
 #if defined(OS_WIN)
   // Adds some padding to prevent a heap-buffer-overflow when an instance of
   // this class is casted into a BrowserAccessibilityWin pointer.
   // http://crbug.com/235508
   // TODO(dmazzoni): Fix this properly.
   static const size_t kDataSize = sizeof(int) + sizeof(BrowserAccessibility);
   uint8 padding_[sizeof(BrowserAccessibilityWin) - kDataSize];
 #endif
 };
 
 int CountedBrowserAccessibility::global_obj_count_ = 0;
 
 // Factory that creates a CountedBrowserAccessibility.
 class CountedBrowserAccessibilityFactory
     : public BrowserAccessibilityFactory {
  public:
   virtual ~CountedBrowserAccessibilityFactory() {}
-  virtual BrowserAccessibility* Create() OVERRIDE {
+  virtual BrowserAccessibility* Create() override {
     return new CountedBrowserAccessibility();
   }
 };
 
 class TestBrowserAccessibilityDelegate
     : public BrowserAccessibilityDelegate {
  public:
   TestBrowserAccessibilityDelegate()
       : got_fatal_error_(false) {}
 
-  virtual void AccessibilitySetFocus(int acc_obj_id) OVERRIDE {}
-  virtual void AccessibilityDoDefaultAction(int acc_obj_id) OVERRIDE {}
-  virtual void AccessibilityShowMenu(const gfx::Point& point) OVERRIDE {}
+  virtual void AccessibilitySetFocus(int acc_obj_id) override {}
+  virtual void AccessibilityDoDefaultAction(int acc_obj_id) override {}
+  virtual void AccessibilityShowMenu(const gfx::Point& point) override {}
   virtual void AccessibilityScrollToMakeVisible(
-      int acc_obj_id, const gfx::Rect& subfocus) OVERRIDE {}
+      int acc_obj_id, const gfx::Rect& subfocus) override {}
   virtual void AccessibilityScrollToPoint(
-      int acc_obj_id, const gfx::Point& point) OVERRIDE {}
+      int acc_obj_id, const gfx::Point& point) override {}
   virtual void AccessibilitySetTextSelection(
-      int acc_obj_id, int start_offset, int end_offset) OVERRIDE {}
-  virtual bool AccessibilityViewHasFocus() const OVERRIDE {
+      int acc_obj_id, int start_offset, int end_offset) override {}
+  virtual bool AccessibilityViewHasFocus() const override {
     return false;
   }
-  virtual gfx::Rect AccessibilityGetViewBounds() const OVERRIDE {
+  virtual gfx::Rect AccessibilityGetViewBounds() const override {
     return gfx::Rect();
   }
   virtual gfx::Point AccessibilityOriginInScreen(
-      const gfx::Rect& bounds) const OVERRIDE {
+      const gfx::Rect& bounds) const override {
     return gfx::Point();
   }
-  virtual void AccessibilityHitTest(const gfx::Point& point) OVERRIDE {}
-  virtual void AccessibilityFatalError() OVERRIDE {
+  virtual void AccessibilityHitTest(const gfx::Point& point) override {}
+  virtual void AccessibilityFatalError() override {
     got_fatal_error_ = true;
   }
-  virtual gfx::AcceleratedWidget AccessibilityGetAcceleratedWidget() OVERRIDE {
+  virtual gfx::AcceleratedWidget AccessibilityGetAcceleratedWidget() override {
     return gfx::kNullAcceleratedWidget;
   }
   virtual gfx::NativeViewAccessible AccessibilityGetNativeViewAccessible()
-      OVERRIDE {
+      override {
     return NULL;
   }
   virtual BrowserAccessibilityManager* AccessibilityGetChildFrame(
-      int accessibility_node_id) OVERRIDE {
+      int accessibility_node_id) override {
     return NULL;
   }
-  virtual BrowserAccessibility* AccessibilityGetParentFrame() OVERRIDE {
+  virtual BrowserAccessibility* AccessibilityGetParentFrame() override {
     return NULL;
   }
 
   bool got_fatal_error() const { return got_fatal_error_; }
   void reset_got_fatal_error() { got_fatal_error_ = false; }
 
 private:
   bool got_fatal_error_;
 };
 
@@ skipping 825 matching lines @@
   ASSERT_EQ(NULL, manager->NextInTreeOrder(node5_accessible));
 
   ASSERT_EQ(NULL, manager->PreviousInTreeOrder(NULL));
   ASSERT_EQ(node4_accessible, manager->PreviousInTreeOrder(node5_accessible));
   ASSERT_EQ(node3_accessible, manager->PreviousInTreeOrder(node4_accessible));
   ASSERT_EQ(node2_accessible, manager->PreviousInTreeOrder(node3_accessible));
   ASSERT_EQ(root_accessible, manager->PreviousInTreeOrder(node2_accessible));
 }
 
 }  // namespace content