Replacing the OVERRIDE with override and FINAL with final in content/browser/[dom_storage|gamepad|…

content/browser/gamepad/gamepad_test_helpers.h

 // 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.
 
 #ifndef CONTENT_BROWSER_GAMEPAD_GAMEPAD_TEST_HELPERS_H_
 #define CONTENT_BROWSER_GAMEPAD_GAMEPAD_TEST_HELPERS_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
 #include "content/browser/gamepad/gamepad_data_fetcher.h"
 #include "third_party/WebKit/public/platform/WebGamepads.h"
 
 namespace content {
 
 class GamepadService;
 
 // Data fetcher that returns canned data for the gamepad provider.
 class MockGamepadDataFetcher : public GamepadDataFetcher {
  public:
   // Initializes the fetcher with the given gamepad data, which will be
   // returned when the provider queries us.
   explicit MockGamepadDataFetcher(const blink::WebGamepads& test_data);
 
   virtual ~MockGamepadDataFetcher();
 
   // GamepadDataFetcher.
   virtual void GetGamepadData(blink::WebGamepads* pads,
-                              bool devices_changed_hint) OVERRIDE;
+                              bool devices_changed_hint) override;
 
   // Blocks the current thread until the GamepadProvider reads from this
   // fetcher on the background thread.
   void WaitForDataRead();
 
   // Blocks the current thread until the GamepadProvider reads from this
   // fetcher on the background thread and issued all callbacks related to the
   // read on the client's thread.
   void WaitForDataReadAndCallbacksIssued();
 
@@ skipping 39 matching lines @@
 
   // Pointer owned by the provider (which is owned by the gamepad service).
   MockGamepadDataFetcher* data_fetcher_;
 
   DISALLOW_COPY_AND_ASSIGN(GamepadServiceTestConstructor);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GAMEPAD_GAMEPAD_TEST_HELPERS_H_