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

content/browser/accessibility/browser_accessibility_win_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/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/scoped_bstr.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_variant.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
@@ skipping 41 matching lines @@
 // CountedBrowserAccessibilityFactory -----------------------------------------
 
 // Factory that creates a CountedBrowserAccessibility.
 class CountedBrowserAccessibilityFactory : public BrowserAccessibilityFactory {
  public:
   CountedBrowserAccessibilityFactory();
 
  private:
   virtual ~CountedBrowserAccessibilityFactory();
 
-  virtual BrowserAccessibility* Create() OVERRIDE;
+  virtual BrowserAccessibility* Create() override;
 
   DISALLOW_COPY_AND_ASSIGN(CountedBrowserAccessibilityFactory);
 };
 
 CountedBrowserAccessibilityFactory::CountedBrowserAccessibilityFactory() {
 }
 
 CountedBrowserAccessibilityFactory::~CountedBrowserAccessibilityFactory() {
 }
 
@@ skipping 10 matching lines @@
 
 
 // BrowserAccessibilityTest ---------------------------------------------------
 
 class BrowserAccessibilityTest : public testing::Test {
  public:
   BrowserAccessibilityTest();
   virtual ~BrowserAccessibilityTest();
 
  private:
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityTest);
 };
 
 BrowserAccessibilityTest::BrowserAccessibilityTest() {
 }
 
 BrowserAccessibilityTest::~BrowserAccessibilityTest() {
 }
 
@@ skipping 569 matching lines @@
   // And the new child exists.
   EXPECT_EQ(ui::AX_ROLE_BUTTON, acc2_2->GetRole());
   EXPECT_EQ(3, acc2_2->GetId());
 
   // Ensure we properly cleaned up.
   manager.reset();
   ASSERT_EQ(0, CountedBrowserAccessibility::num_instances());
 }
 
 }  // namespace content