Replace OVERRIDE and FINAL with override and final in content/public/[a-s]*

BUG=417463

Review URL: https://codereview.chromium.org/629203002

Cr-Commit-Position: refs/heads/master@{#298459}

40 files changed, 230 insertions, 230 deletions

diff --git a/content/public/browser/browser_message_filter.cc b/content/public/browser/browser_message_filter.cc
index 595570d..df9026d 100644
--- a/content/public/browser/browser_message_filter.cc
+++ b/content/public/browser/browser_message_filter.cc
@@ -30,26 +30,26 @@ class BrowserMessageFilter::Internal : public IPC::MessageFilter {
   virtual ~Internal() {}
 
   // IPC::MessageFilter implementation:
-  virtual void OnFilterAdded(IPC::Sender* sender) OVERRIDE {
+  virtual void OnFilterAdded(IPC::Sender* sender) override {
     filter_->sender_ = sender;
     filter_->OnFilterAdded(sender);
   }
 
-  virtual void OnFilterRemoved() OVERRIDE {
+  virtual void OnFilterRemoved() override {
     filter_->OnFilterRemoved();
   }
 
-  virtual void OnChannelClosing() OVERRIDE {
+  virtual void OnChannelClosing() override {
     filter_->sender_ = NULL;
     filter_->OnChannelClosing();
   }
 
-  virtual void OnChannelConnected(int32 peer_pid) OVERRIDE {
+  virtual void OnChannelConnected(int32 peer_pid) override {
     filter_->peer_pid_ = peer_pid;
     filter_->OnChannelConnected(peer_pid);
   }
 
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
+  virtual bool OnMessageReceived(const IPC::Message& message) override {
     BrowserThread::ID thread = BrowserThread::IO;
     filter_->OverrideThreadForMessage(message, &thread);
 
@@ -79,7 +79,7 @@ class BrowserMessageFilter::Internal : public IPC::MessageFilter {
   }
 
   virtual bool GetSupportedMessageClasses(
-      std::vector<uint32>* supported_message_classes) const OVERRIDE {
+      std::vector<uint32>* supported_message_classes) const override {
     supported_message_classes->assign(
         filter_->message_classes_to_filter().begin(),
         filter_->message_classes_to_filter().end());
diff --git a/content/public/browser/browser_message_filter.h b/content/public/browser/browser_message_filter.h
index 81f06a9..491908d 100644
--- a/content/public/browser/browser_message_filter.h
+++ b/content/public/browser/browser_message_filter.h
@@ -51,7 +51,7 @@ class CONTENT_EXPORT BrowserMessageFilter
 
   // IPC::Sender implementation.  Can be called on any thread.  Can't send sync
   // messages (since we don't want to block the browser on any other process).
-  virtual bool Send(IPC::Message* message) OVERRIDE;
+  virtual bool Send(IPC::Message* message) override;
 
   // If you want the given message to be dispatched to your OnMessageReceived on
   // a different thread, there are two options, either
diff --git a/content/public/browser/desktop_media_id.cc b/content/public/browser/desktop_media_id.cc
index 18b0955..594d1aa 100644
--- a/content/public/browser/desktop_media_id.cc
+++ b/content/public/browser/desktop_media_id.cc
@@ -58,7 +58,7 @@ class AuraWindowRegistry : public aura::WindowObserver {
   virtual ~AuraWindowRegistry() {}
 
   // WindowObserver overrides.
-  virtual void OnWindowDestroying(aura::Window* window) OVERRIDE {
+  virtual void OnWindowDestroying(aura::Window* window) override {
     std::map<aura::Window*, int>::iterator it = window_to_id_map_.find(window);
     DCHECK(it != window_to_id_map_.end());
     id_to_window_map_.erase(it->second);
diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h
index 131e0d8..ea9b81e 100644
--- a/content/public/browser/web_contents_observer.h
+++ b/content/public/browser/web_contents_observer.h
@@ -322,10 +322,10 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener,
                                  RenderFrameHost* render_frame_host);
 
   // IPC::Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
   // IPC::Sender implementation.
-  virtual bool Send(IPC::Message* message) OVERRIDE;
+  virtual bool Send(IPC::Message* message) override;
   int routing_id() const;
 
   WebContents* web_contents() const;
diff --git a/content/public/renderer/platform_event_observer.h b/content/public/renderer/platform_event_observer.h
index e14263e..6d56922 100644
--- a/content/public/renderer/platform_event_observer.h
+++ b/content/public/renderer/platform_event_observer.h
@@ -71,7 +71,7 @@ class PlatformEventObserver : public PlatformEventObserverBase,
 
   // Called when a new IPC message is received. Must be used to listen to the
   // responses from the browser process if any expected.
-  virtual bool OnControlMessageReceived(const IPC::Message& msg) OVERRIDE {
+  virtual bool OnControlMessageReceived(const IPC::Message& msg) override {
     return false;
   }
 
diff --git a/content/public/renderer/render_frame_observer.h b/content/public/renderer/render_frame_observer.h
index b01856e..2886f35 100644
--- a/content/public/renderer/render_frame_observer.h
+++ b/content/public/renderer/render_frame_observer.h
@@ -75,10 +75,10 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
   virtual void DidCommitCompositorFrame() {}
 
   // IPC::Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
   // IPC::Sender implementation.
-  virtual bool Send(IPC::Message* message) OVERRIDE;
+  virtual bool Send(IPC::Message* message) override;
 
   RenderFrame* render_frame() const;
   int routing_id() const { return routing_id_; }
diff --git a/content/public/renderer/render_view_observer.h b/content/public/renderer/render_view_observer.h
index 49f013a..a0dd80b 100644
--- a/content/public/renderer/render_view_observer.h
+++ b/content/public/renderer/render_view_observer.h
@@ -98,10 +98,10 @@ class CONTENT_EXPORT RenderViewObserver : public IPC::Listener,
   virtual void OnStop() {}
 
   // IPC::Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
   // IPC::Sender implementation.
-  virtual bool Send(IPC::Message* message) OVERRIDE;
+  virtual bool Send(IPC::Message* message) override;
 
   RenderView* render_view() const;
   int routing_id() const { return routing_id_; }
diff --git a/content/public/test/browser_test.h b/content/public/test/browser_test.h
index 8b2f799..b25d46c 100644
--- a/content/public/test/browser_test.h
+++ b/content/public/test/browser_test.h
@@ -22,9 +22,9 @@ class GTEST_TEST_CLASS_NAME_(test_case_name, test_name) : public parent_class {\
  public:\
   GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {}\
  protected:\
-  virtual void RunTestOnMainThread() OVERRIDE;\
+  virtual void RunTestOnMainThread() override;\
  private:\
-  virtual void TestBody() OVERRIDE {}\
+  virtual void TestBody() override {}\
   static ::testing::TestInfo* const test_info_;\
   GTEST_DISALLOW_COPY_AND_ASSIGN_(\
       GTEST_TEST_CLASS_NAME_(test_case_name, test_name));\
@@ -51,9 +51,9 @@ void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::RunTestOnMainThread()
    public: \
     GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {} \
    protected: \
-    virtual void RunTestOnMainThread() OVERRIDE; \
+    virtual void RunTestOnMainThread() override; \
    private: \
-    virtual void TestBody() OVERRIDE {} \
+    virtual void TestBody() override {} \
     static int AddToRegistry() { \
       ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \
           GetTestCasePatternHolder<test_case_name>(\
diff --git a/content/public/test/browser_test_base.cc b/content/public/test/browser_test_base.cc
index c5083ee..c83968b3 100644
--- a/content/public/test/browser_test_base.cc
+++ b/content/public/test/browser_test_base.cc
@@ -89,7 +89,7 @@ class LocalHostResolverProc : public net::HostResolverProc {
                       net::AddressFamily address_family,
                       net::HostResolverFlags host_resolver_flags,
                       net::AddressList* addrlist,
-                      int* os_error) OVERRIDE {
+                      int* os_error) override {
     const char* kLocalHostNames[] = {"localhost", "127.0.0.1", "::1"};
     bool local = false;
 
diff --git a/content/public/test/browser_test_base.h b/content/public/test/browser_test_base.h
index 1514c65..5f7478d 100644
--- a/content/public/test/browser_test_base.h
+++ b/content/public/test/browser_test_base.h
@@ -37,10 +37,10 @@ class BrowserTestBase : public testing::Test {
 
   // Configures everything for an in process browser test, then invokes
   // BrowserMain. BrowserMain ends up invoking RunTestOnMainThreadLoop.
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   // Restores state configured in SetUp.
-  virtual void TearDown() OVERRIDE;
+  virtual void TearDown() override;
 
   // Override this to add any custom setup code that needs to be done on the
   // main thread after the browser is created and just before calling
diff --git a/content/public/test/browser_test_utils.h b/content/public/test/browser_test_utils.h
index c6b17cd..ba7d080 100644
--- a/content/public/test/browser_test_utils.h
+++ b/content/public/test/browser_test_utils.h
@@ -240,8 +240,8 @@ class TitleWatcher : public WebContentsObserver {
 
  private:
   // Overridden WebContentsObserver methods.
-  virtual void DidStopLoading(RenderViewHost* render_view_host) OVERRIDE;
-  virtual void TitleWasSet(NavigationEntry* entry, bool explicit_set) OVERRIDE;
+  virtual void DidStopLoading(RenderViewHost* render_view_host) override;
+  virtual void TitleWasSet(NavigationEntry* entry, bool explicit_set) override;
 
   void TestTitle();
 
@@ -265,7 +265,7 @@ class WebContentsDestroyedWatcher : public WebContentsObserver {
 
  private:
   // Overridden WebContentsObserver methods.
-  virtual void WebContentsDestroyed() OVERRIDE;
+  virtual void WebContentsDestroyed() override;
 
   scoped_refptr<MessageLoopRunner> message_loop_runner_;
 
@@ -294,8 +294,8 @@ class RenderProcessHostWatcher : public RenderProcessHostObserver {
   virtual void RenderProcessExited(RenderProcessHost* host,
                                    base::ProcessHandle handle,
                                    base::TerminationStatus status,
-                                   int exit_code) OVERRIDE;
-  virtual void RenderProcessHostDestroyed(RenderProcessHost* host) OVERRIDE;
+                                   int exit_code) override;
+  virtual void RenderProcessHostDestroyed(RenderProcessHost* host) override;
 
   RenderProcessHost* render_process_host_;
   WatchType type_;
@@ -325,7 +325,7 @@ class DOMMessageQueue : public NotificationObserver {
   // Overridden NotificationObserver methods.
   virtual void Observe(int type,
                        const NotificationSource& source,
-                       const NotificationDetails& details) OVERRIDE;
+                       const NotificationDetails& details) override;
 
  private:
   NotificationRegistrar registrar_;
diff --git a/content/public/test/content_browser_test.h b/content/public/test/content_browser_test.h
index 7fa9d34..4ab7678 100644
--- a/content/public/test/content_browser_test.h
+++ b/content/public/test/content_browser_test.h
@@ -20,11 +20,11 @@ class ContentBrowserTest : public BrowserTestBase {
   virtual ~ContentBrowserTest();
 
   // testing::Test:
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   // BrowserTestBase:
-  virtual void RunTestOnMainThreadLoop() OVERRIDE;
+  virtual void RunTestOnMainThreadLoop() override;
 
  protected:
   // Creates a new window and loads about:blank.
diff --git a/content/public/test/content_browser_test_utils.cc b/content/public/test/content_browser_test_utils.cc
index a83c3a6..4786544 100644
--- a/content/public/test/content_browser_test_utils.cc
+++ b/content/public/test/content_browser_test_utils.cc
@@ -110,7 +110,7 @@ class RenderViewCreatedObserver : public WebContentsObserver {
   }
 
   // WebContentsObserver:
-  virtual void RenderViewCreated(RenderViewHost* rvh) OVERRIDE {
+  virtual void RenderViewCreated(RenderViewHost* rvh) override {
     render_view_created_called_ = true;
   }
 
diff --git a/content/public/test/content_test_suite_base.cc b/content/public/test/content_test_suite_base.cc
index 6fa29b0..70666e5 100644
--- a/content/public/test/content_test_suite_base.cc
+++ b/content/public/test/content_test_suite_base.cc
@@ -43,7 +43,7 @@ class ContentTestSuiteBaseListener : public testing::EmptyTestEventListener {
  public:
   ContentTestSuiteBaseListener() {
   }
-  virtual void OnTestEnd(const testing::TestInfo& test_info) OVERRIDE {
+  virtual void OnTestEnd(const testing::TestInfo& test_info) override {
     BrowserThreadImpl::FlushThreadPoolHelperForTesting();
   }
  private:
diff --git a/content/public/test/content_test_suite_base.h b/content/public/test/content_test_suite_base.h
index 1d3f5b4..ee85d48 100644
--- a/content/public/test/content_test_suite_base.h
+++ b/content/public/test/content_test_suite_base.h
@@ -19,7 +19,7 @@ class ContentTestSuiteBase : public base::TestSuite {
  protected:
   ContentTestSuiteBase(int argc, char** argv);
 
-  virtual void Initialize() OVERRIDE;
+  virtual void Initialize() override;
 
   // The methods below are for unit test setup.
 
diff --git a/content/public/test/download_test_observer.h b/content/public/test/download_test_observer.h
index a06e994..6ad9675 100644
--- a/content/public/test/download_test_observer.h
+++ b/content/public/test/download_test_observer.h
@@ -37,8 +37,8 @@ class DownloadUpdatedObserver : public DownloadItem::Observer {
 
  private:
   // DownloadItem::Observer
-  virtual void OnDownloadUpdated(DownloadItem* item) OVERRIDE;
-  virtual void OnDownloadDestroyed(DownloadItem* item) OVERRIDE;
+  virtual void OnDownloadUpdated(DownloadItem* item) override;
+  virtual void OnDownloadDestroyed(DownloadItem* item) override;
 
   DownloadItem* item_;
   EventFilter filter_;
@@ -83,13 +83,13 @@ class DownloadTestObserver : public DownloadManager::Observer,
   bool IsFinished() const;
 
   // DownloadItem::Observer
-  virtual void OnDownloadUpdated(DownloadItem* download) OVERRIDE;
-  virtual void OnDownloadDestroyed(DownloadItem* download) OVERRIDE;
+  virtual void OnDownloadUpdated(DownloadItem* download) override;
+  virtual void OnDownloadDestroyed(DownloadItem* download) override;
 
   // DownloadManager::Observer
   virtual void OnDownloadCreated(
-      DownloadManager* manager, DownloadItem* item) OVERRIDE;
-  virtual void ManagerGoingDown(DownloadManager* manager) OVERRIDE;
+      DownloadManager* manager, DownloadItem* item) override;
+  virtual void ManagerGoingDown(DownloadManager* manager) override;
 
   size_t NumDangerousDownloadsSeen() const;
 
@@ -181,7 +181,7 @@ class DownloadTestObserverTerminal : public DownloadTestObserver {
   virtual ~DownloadTestObserverTerminal();
 
  private:
-  virtual bool IsDownloadInFinalState(DownloadItem* download) OVERRIDE;
+  virtual bool IsDownloadInFinalState(DownloadItem* download) override;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadTestObserverTerminal);
 };
@@ -201,7 +201,7 @@ class DownloadTestObserverInProgress : public DownloadTestObserver {
   virtual ~DownloadTestObserverInProgress();
 
  private:
-  virtual bool IsDownloadInFinalState(DownloadItem* download) OVERRIDE;
+  virtual bool IsDownloadInFinalState(DownloadItem* download) override;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadTestObserverInProgress);
 };
@@ -218,7 +218,7 @@ class DownloadTestObserverInterrupted : public DownloadTestObserver {
   virtual ~DownloadTestObserverInterrupted();
 
  private:
-  virtual bool IsDownloadInFinalState(DownloadItem* download) OVERRIDE;
+  virtual bool IsDownloadInFinalState(DownloadItem* download) override;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadTestObserverInterrupted);
 };
@@ -242,11 +242,11 @@ class DownloadTestFlushObserver
   // DownloadsManager observer methods.
   virtual void OnDownloadCreated(
       DownloadManager* manager,
-      DownloadItem* item) OVERRIDE;
+      DownloadItem* item) override;
 
   // DownloadItem observer methods.
-  virtual void OnDownloadUpdated(DownloadItem* download) OVERRIDE;
-  virtual void OnDownloadDestroyed(DownloadItem* download) OVERRIDE;
+  virtual void OnDownloadUpdated(DownloadItem* download) override;
+  virtual void OnDownloadDestroyed(DownloadItem* download) override;
 
  protected:
   friend class base::RefCountedThreadSafe<DownloadTestFlushObserver>;
diff --git a/content/public/test/fake_speech_recognition_manager.h b/content/public/test/fake_speech_recognition_manager.h
index ba58c90..bd04698 100644
--- a/content/public/test/fake_speech_recognition_manager.h
+++ b/content/public/test/fake_speech_recognition_manager.h
@@ -43,23 +43,23 @@ class FakeSpeechRecognitionManager : public SpeechRecognitionManager {
 
   // SpeechRecognitionManager methods.
   virtual int CreateSession(
-      const SpeechRecognitionSessionConfig& config) OVERRIDE;
-  virtual void StartSession(int session_id) OVERRIDE;
-  virtual void AbortSession(int session_id) OVERRIDE;
-  virtual void StopAudioCaptureForSession(int session_id) OVERRIDE;
-  virtual void AbortAllSessionsForRenderProcess(int render_process_id) OVERRIDE;
+      const SpeechRecognitionSessionConfig& config) override;
+  virtual void StartSession(int session_id) override;
+  virtual void AbortSession(int session_id) override;
+  virtual void StopAudioCaptureForSession(int session_id) override;
+  virtual void AbortAllSessionsForRenderProcess(int render_process_id) override;
   virtual void AbortAllSessionsForRenderView(int render_process_id,
-                                             int render_view_id) OVERRIDE;
-  virtual bool HasAudioInputDevices() OVERRIDE;
-  virtual base::string16 GetAudioInputDeviceModel() OVERRIDE;
-  virtual void ShowAudioInputSettings() OVERRIDE {}
+                                             int render_view_id) override;
+  virtual bool HasAudioInputDevices() override;
+  virtual base::string16 GetAudioInputDeviceModel() override;
+  virtual void ShowAudioInputSettings() override {}
   virtual int GetSession(int render_process_id,
                          int render_view_id,
-                         int request_id) const OVERRIDE;
+                         int request_id) const override;
   virtual const SpeechRecognitionSessionConfig& GetSessionConfig(
-      int session_id) const OVERRIDE;
+      int session_id) const override;
   virtual SpeechRecognitionSessionContext GetSessionContext(
-      int session_id) const OVERRIDE;
+      int session_id) const override;
 
  private:
   void SetFakeRecognitionResult();
diff --git a/content/public/test/frame_load_waiter.h b/content/public/test/frame_load_waiter.h
index 278f13a..b226ba4 100644
--- a/content/public/test/frame_load_waiter.h
+++ b/content/public/test/frame_load_waiter.h
@@ -20,7 +20,7 @@ class FrameLoadWaiter : public RenderFrameObserver {
   void Wait();
 
  private:
-  virtual void DidFinishLoad() OVERRIDE;
+  virtual void DidFinishLoad() override;
 
   base::RunLoop run_loop_;
 
diff --git a/content/public/test/javascript_test_observer.h b/content/public/test/javascript_test_observer.h
index 3b7b1f3..c86fda8 100644
--- a/content/public/test/javascript_test_observer.h
+++ b/content/public/test/javascript_test_observer.h
@@ -76,7 +76,7 @@ class JavascriptTestObserver : public NotificationObserver {
   virtual void Observe(
       int type,
       const NotificationSource& source,
-      const NotificationDetails& details) OVERRIDE;
+      const NotificationDetails& details) override;
 
  private:
   // This message did not signal the end of a test, keep going.
diff --git a/content/public/test/mock_download_item.h b/content/public/test/mock_download_item.h
index f027a91..19ebe62 100644
--- a/content/public/test/mock_download_item.h
+++ b/content/public/test/mock_download_item.h
@@ -24,8 +24,8 @@ class MockDownloadItem : public DownloadItem {
   // Management of observer lists is common in tests. So Add/RemoveObserver
   // methods are not mocks. In addition, any registered observers will receive a
   // OnDownloadDestroyed() notification when the mock is destroyed.
-  virtual void AddObserver(Observer* observer) OVERRIDE;
-  virtual void RemoveObserver(Observer* observer) OVERRIDE;
+  virtual void AddObserver(Observer* observer) override;
+  virtual void RemoveObserver(Observer* observer) override;
 
   // Dispatches an OnDownloadOpened() notification to observers.
   void NotifyObserversDownloadOpened();
diff --git a/content/public/test/mock_download_manager.h b/content/public/test/mock_download_manager.h
index 1ab4ca5..3334290 100644
--- a/content/public/test/mock_download_manager.h
+++ b/content/public/test/mock_download_manager.h
@@ -84,7 +84,7 @@ class MockDownloadManager : public DownloadManager {
   virtual void StartDownload(
       scoped_ptr<DownloadCreateInfo> info,
       scoped_ptr<ByteStreamReader> stream,
-      const DownloadUrlParameters::OnStartedCallback& callback) OVERRIDE;
+      const DownloadUrlParameters::OnStartedCallback& callback) override;
 
   MOCK_METHOD2(MockStartDownload,
                void(DownloadCreateInfo*, ByteStreamReader*));
@@ -93,7 +93,7 @@ class MockDownloadManager : public DownloadManager {
   MOCK_METHOD1(RemoveDownloads, int(base::Time remove_begin));
   MOCK_METHOD0(RemoveAllDownloads, int());
   MOCK_METHOD1(DownloadUrlMock, void(DownloadUrlParameters*));
-  virtual void DownloadUrl(scoped_ptr<DownloadUrlParameters> params) OVERRIDE {
+  virtual void DownloadUrl(scoped_ptr<DownloadUrlParameters> params) override {
     DownloadUrlMock(params.get());
   }
   MOCK_METHOD1(AddObserver, void(Observer* observer));
@@ -117,7 +117,7 @@ class MockDownloadManager : public DownloadManager {
       DownloadItem::DownloadState state,
       DownloadDangerType danger_type,
       DownloadInterruptReason interrupt_reason,
-      bool opened) OVERRIDE;
+      bool opened) override;
 
   MOCK_METHOD1(MockCreateDownloadItem,
                DownloadItem*(CreateDownloadItemAdapter adapter));
diff --git a/content/public/test/mock_render_process_host.h b/content/public/test/mock_render_process_host.h
index f769c5f..4bae5a1 100644
--- a/content/public/test/mock_render_process_host.h
+++ b/content/public/test/mock_render_process_host.h
@@ -33,63 +33,63 @@ class MockRenderProcessHost : public RenderProcessHost {
   int bad_msg_count() const { return bad_msg_count_; }
 
   // RenderProcessHost implementation (public portion).
-  virtual void EnableSendQueue() OVERRIDE;
-  virtual bool Init() OVERRIDE;
-  virtual int GetNextRoutingID() OVERRIDE;
-  virtual void AddRoute(int32 routing_id, IPC::Listener* listener) OVERRIDE;
-  virtual void RemoveRoute(int32 routing_id) OVERRIDE;
-  virtual void AddObserver(RenderProcessHostObserver* observer) OVERRIDE;
-  virtual void RemoveObserver(RenderProcessHostObserver* observer) OVERRIDE;
-  virtual void ReceivedBadMessage() OVERRIDE;
-  virtual void WidgetRestored() OVERRIDE;
-  virtual void WidgetHidden() OVERRIDE;
-  virtual int VisibleWidgetCount() const OVERRIDE;
-  virtual bool IsIsolatedGuest() const OVERRIDE;
-  virtual StoragePartition* GetStoragePartition() const OVERRIDE;
+  virtual void EnableSendQueue() override;
+  virtual bool Init() override;
+  virtual int GetNextRoutingID() override;
+  virtual void AddRoute(int32 routing_id, IPC::Listener* listener) override;
+  virtual void RemoveRoute(int32 routing_id) override;
+  virtual void AddObserver(RenderProcessHostObserver* observer) override;
+  virtual void RemoveObserver(RenderProcessHostObserver* observer) override;
+  virtual void ReceivedBadMessage() override;
+  virtual void WidgetRestored() override;
+  virtual void WidgetHidden() override;
+  virtual int VisibleWidgetCount() const override;
+  virtual bool IsIsolatedGuest() const override;
+  virtual StoragePartition* GetStoragePartition() const override;
   virtual void AddWord(const base::string16& word);
-  virtual bool FastShutdownIfPossible() OVERRIDE;
-  virtual bool FastShutdownStarted() const OVERRIDE;
-  virtual void DumpHandles() OVERRIDE;
-  virtual base::ProcessHandle GetHandle() const OVERRIDE;
-  virtual int GetID() const OVERRIDE;
-  virtual bool HasConnection() const OVERRIDE;
-  virtual void SetIgnoreInputEvents(bool ignore_input_events) OVERRIDE;
-  virtual bool IgnoreInputEvents() const OVERRIDE;
-  virtual void Cleanup() OVERRIDE;
-  virtual void AddPendingView() OVERRIDE;
-  virtual void RemovePendingView() OVERRIDE;
-  virtual void SetSuddenTerminationAllowed(bool allowed) OVERRIDE;
-  virtual bool SuddenTerminationAllowed() const OVERRIDE;
-  virtual BrowserContext* GetBrowserContext() const OVERRIDE;
+  virtual bool FastShutdownIfPossible() override;
+  virtual bool FastShutdownStarted() const override;
+  virtual void DumpHandles() override;
+  virtual base::ProcessHandle GetHandle() const override;
+  virtual int GetID() const override;
+  virtual bool HasConnection() const override;
+  virtual void SetIgnoreInputEvents(bool ignore_input_events) override;
+  virtual bool IgnoreInputEvents() const override;
+  virtual void Cleanup() override;
+  virtual void AddPendingView() override;
+  virtual void RemovePendingView() override;
+  virtual void SetSuddenTerminationAllowed(bool allowed) override;
+  virtual bool SuddenTerminationAllowed() const override;
+  virtual BrowserContext* GetBrowserContext() const override;
   virtual bool InSameStoragePartition(
-      StoragePartition* partition) const OVERRIDE;
-  virtual IPC::ChannelProxy* GetChannel() OVERRIDE;
-  virtual void AddFilter(BrowserMessageFilter* filter) OVERRIDE;
-  virtual bool FastShutdownForPageCount(size_t count) OVERRIDE;
-  virtual base::TimeDelta GetChildProcessIdleTime() const OVERRIDE;
-  virtual void ResumeRequestsForView(int route_id) OVERRIDE;
-  virtual void FilterURL(bool empty_allowed, GURL* url) OVERRIDE;
+      StoragePartition* partition) const override;
+  virtual IPC::ChannelProxy* GetChannel() override;
+  virtual void AddFilter(BrowserMessageFilter* filter) override;
+  virtual bool FastShutdownForPageCount(size_t count) override;
+  virtual base::TimeDelta GetChildProcessIdleTime() const override;
+  virtual void ResumeRequestsForView(int route_id) override;
+  virtual void FilterURL(bool empty_allowed, GURL* url) override;
 #if defined(ENABLE_WEBRTC)
-  virtual void EnableAecDump(const base::FilePath& file) OVERRIDE;
-  virtual void DisableAecDump() OVERRIDE;
+  virtual void EnableAecDump(const base::FilePath& file) override;
+  virtual void DisableAecDump() override;
   virtual void SetWebRtcLogMessageCallback(
-      base::Callback<void(const std::string&)> callback) OVERRIDE;
+      base::Callback<void(const std::string&)> callback) override;
   virtual WebRtcStopRtpDumpCallback StartRtpDump(
       bool incoming,
       bool outgoing,
-      const WebRtcRtpPacketCallback& packet_callback) OVERRIDE;
+      const WebRtcRtpPacketCallback& packet_callback) override;
 #endif
   virtual void ResumeDeferredNavigation(const GlobalRequestID& request_id)
-      OVERRIDE;
-  virtual void NotifyTimezoneChange() OVERRIDE;
-  virtual ServiceRegistry* GetServiceRegistry() OVERRIDE;
+      override;
+  virtual void NotifyTimezoneChange() override;
+  virtual ServiceRegistry* GetServiceRegistry() override;
 
   // IPC::Sender via RenderProcessHost.
-  virtual bool Send(IPC::Message* msg) OVERRIDE;
+  virtual bool Send(IPC::Message* msg) override;
 
   // IPC::Listener via RenderProcessHost.
-  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
-  virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& msg) override;
+  virtual void OnChannelConnected(int32 peer_pid) override;
 
   // Attaches the factory object so we can remove this object in its destructor
   // and prevent MockRenderProcessHostFacotry from deleting it.
@@ -134,7 +134,7 @@ class MockRenderProcessHostFactory : public RenderProcessHostFactory {
 
   virtual RenderProcessHost* CreateRenderProcessHost(
       BrowserContext* browser_context,
-      SiteInstance* site_instance) const OVERRIDE;
+      SiteInstance* site_instance) const override;
 
   // Removes the given MockRenderProcessHost from the MockRenderProcessHost list
   // without deleting it. When a test deletes a MockRenderProcessHost, we need
diff --git a/content/public/test/mock_render_thread.h b/content/public/test/mock_render_thread.h
index f03b684..f4a959b 100644
--- a/content/public/test/mock_render_thread.h
+++ b/content/public/test/mock_render_thread.h
@@ -36,42 +36,42 @@ class MockRenderThread : public RenderThread {
   IPC::TestSink& sink() { return sink_; }
 
   // RenderThread implementation:
-  virtual bool Send(IPC::Message* msg) OVERRIDE;
-  virtual base::MessageLoop* GetMessageLoop() OVERRIDE;
-  virtual IPC::SyncChannel* GetChannel() OVERRIDE;
-  virtual std::string GetLocale() OVERRIDE;
-  virtual IPC::SyncMessageFilter* GetSyncMessageFilter() OVERRIDE;
+  virtual bool Send(IPC::Message* msg) override;
+  virtual base::MessageLoop* GetMessageLoop() override;
+  virtual IPC::SyncChannel* GetChannel() override;
+  virtual std::string GetLocale() override;
+  virtual IPC::SyncMessageFilter* GetSyncMessageFilter() override;
   virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy()
-      OVERRIDE;
-  virtual void AddRoute(int32 routing_id, IPC::Listener* listener) OVERRIDE;
-  virtual void RemoveRoute(int32 routing_id) OVERRIDE;
-  virtual int GenerateRoutingID() OVERRIDE;
-  virtual void AddFilter(IPC::MessageFilter* filter) OVERRIDE;
-  virtual void RemoveFilter(IPC::MessageFilter* filter) OVERRIDE;
-  virtual void AddObserver(RenderProcessObserver* observer) OVERRIDE;
-  virtual void RemoveObserver(RenderProcessObserver* observer) OVERRIDE;
+      override;
+  virtual void AddRoute(int32 routing_id, IPC::Listener* listener) override;
+  virtual void RemoveRoute(int32 routing_id) override;
+  virtual int GenerateRoutingID() override;
+  virtual void AddFilter(IPC::MessageFilter* filter) override;
+  virtual void RemoveFilter(IPC::MessageFilter* filter) override;
+  virtual void AddObserver(RenderProcessObserver* observer) override;
+  virtual void RemoveObserver(RenderProcessObserver* observer) override;
   virtual void SetResourceDispatcherDelegate(
-      ResourceDispatcherDelegate* delegate) OVERRIDE;
-  virtual void EnsureWebKitInitialized() OVERRIDE;
-  virtual void RecordAction(const base::UserMetricsAction& action) OVERRIDE;
-  virtual void RecordComputedAction(const std::string& action) OVERRIDE;
+      ResourceDispatcherDelegate* delegate) override;
+  virtual void EnsureWebKitInitialized() override;
+  virtual void RecordAction(const base::UserMetricsAction& action) override;
+  virtual void RecordComputedAction(const std::string& action) override;
   virtual scoped_ptr<base::SharedMemory> HostAllocateSharedMemoryBuffer(
-      size_t buffer_size) OVERRIDE;
-  virtual void RegisterExtension(v8::Extension* extension) OVERRIDE;
-  virtual void ScheduleIdleHandler(int64 initial_delay_ms) OVERRIDE;
-  virtual void IdleHandler() OVERRIDE;
-  virtual int64 GetIdleNotificationDelayInMs() const OVERRIDE;
+      size_t buffer_size) override;
+  virtual void RegisterExtension(v8::Extension* extension) override;
+  virtual void ScheduleIdleHandler(int64 initial_delay_ms) override;
+  virtual void IdleHandler() override;
+  virtual int64 GetIdleNotificationDelayInMs() const override;
   virtual void SetIdleNotificationDelayInMs(
-      int64 idle_notification_delay_in_ms) OVERRIDE;
-  virtual void UpdateHistograms(int sequence_number) OVERRIDE;
-  virtual int PostTaskToAllWebWorkers(const base::Closure& closure) OVERRIDE;
-  virtual bool ResolveProxy(const GURL& url, std::string* proxy_list) OVERRIDE;
-  virtual base::WaitableEvent* GetShutdownEvent() OVERRIDE;
+      int64 idle_notification_delay_in_ms) override;
+  virtual void UpdateHistograms(int sequence_number) override;
+  virtual int PostTaskToAllWebWorkers(const base::Closure& closure) override;
+  virtual bool ResolveProxy(const GURL& url, std::string* proxy_list) override;
+  virtual base::WaitableEvent* GetShutdownEvent() override;
 #if defined(OS_WIN)
-  virtual void PreCacheFont(const LOGFONT& log_font) OVERRIDE;
-  virtual void ReleaseCachedFonts() OVERRIDE;
+  virtual void PreCacheFont(const LOGFONT& log_font) override;
+  virtual void ReleaseCachedFonts() override;
 #endif
-  virtual ServiceRegistry* GetServiceRegistry() OVERRIDE;
+  virtual ServiceRegistry* GetServiceRegistry() override;
 
   //////////////////////////////////////////////////////////////////////////
   // The following functions are called by the test itself.
diff --git a/content/public/test/mock_resource_context.h b/content/public/test/mock_resource_context.h
index e42f5c6..b8e2c8c 100644
--- a/content/public/test/mock_resource_context.h
+++ b/content/public/test/mock_resource_context.h
@@ -26,8 +26,8 @@ class MockResourceContext : public ResourceContext {
   virtual ~MockResourceContext();
 
   // ResourceContext implementation:
-  virtual net::HostResolver* GetHostResolver() OVERRIDE;
-  virtual net::URLRequestContext* GetRequestContext() OVERRIDE;
+  virtual net::HostResolver* GetHostResolver() override;
+  virtual net::URLRequestContext* GetRequestContext() override;
 
  private:
   net::URLRequestContext* test_request_context_;
diff --git a/content/public/test/mock_special_storage_policy.h b/content/public/test/mock_special_storage_policy.h
index ceaf9b1..271f646 100644
--- a/content/public/test/mock_special_storage_policy.h
+++ b/content/public/test/mock_special_storage_policy.h
@@ -19,13 +19,13 @@ class MockSpecialStoragePolicy : public storage::SpecialStoragePolicy {
  public:
   MockSpecialStoragePolicy();
 
-  virtual bool IsStorageProtected(const GURL& origin) OVERRIDE;
-  virtual bool IsStorageUnlimited(const GURL& origin) OVERRIDE;
-  virtual bool IsStorageSessionOnly(const GURL& origin) OVERRIDE;
-  virtual bool CanQueryDiskSize(const GURL& origin) OVERRIDE;
-  virtual bool IsFileHandler(const std::string& extension_id) OVERRIDE;
-  virtual bool HasIsolatedStorage(const GURL& origin) OVERRIDE;
-  virtual bool HasSessionOnlyOrigins() OVERRIDE;
+  virtual bool IsStorageProtected(const GURL& origin) override;
+  virtual bool IsStorageUnlimited(const GURL& origin) override;
+  virtual bool IsStorageSessionOnly(const GURL& origin) override;
+  virtual bool CanQueryDiskSize(const GURL& origin) override;
+  virtual bool IsFileHandler(const std::string& extension_id) override;
+  virtual bool HasIsolatedStorage(const GURL& origin) override;
+  virtual bool HasSessionOnlyOrigins() override;
 
   void AddProtected(const GURL& origin) {
     protected_.insert(origin);
diff --git a/content/public/test/mock_storage_client.h b/content/public/test/mock_storage_client.h
index 9576d6c..29c808c 100644
--- a/content/public/test/mock_storage_client.h
+++ b/content/public/test/mock_storage_client.h
@@ -53,19 +53,19 @@ class MockStorageClient : public QuotaClient {
   base::Time IncrementMockTime();
 
   // QuotaClient methods.
-  virtual QuotaClient::ID id() const OVERRIDE;
-  virtual void OnQuotaManagerDestroyed() OVERRIDE;
+  virtual QuotaClient::ID id() const override;
+  virtual void OnQuotaManagerDestroyed() override;
   virtual void GetOriginUsage(const GURL& origin_url,
                               StorageType type,
-                              const GetUsageCallback& callback) OVERRIDE;
+                              const GetUsageCallback& callback) override;
   virtual void GetOriginsForType(StorageType type,
-                                 const GetOriginsCallback& callback) OVERRIDE;
+                                 const GetOriginsCallback& callback) override;
   virtual void GetOriginsForHost(StorageType type, const std::string& host,
-                                 const GetOriginsCallback& callback) OVERRIDE;
+                                 const GetOriginsCallback& callback) override;
   virtual void DeleteOriginData(const GURL& origin,
                                 StorageType type,
-                                const DeletionCallback& callback) OVERRIDE;
-  virtual bool DoesSupport(storage::StorageType type) const OVERRIDE;
+                                const DeletionCallback& callback) override;
+  virtual bool DoesSupport(storage::StorageType type) const override;
 
  private:
   void RunGetOriginUsage(const GURL& origin_url,
diff --git a/content/public/test/nested_message_pump_android.h b/content/public/test/nested_message_pump_android.h
index 7396957..4b7aeba 100644
--- a/content/public/test/nested_message_pump_android.h
+++ b/content/public/test/nested_message_pump_android.h
@@ -17,12 +17,12 @@ class NestedMessagePumpAndroid : public base::MessagePumpForUI {
  public:
   NestedMessagePumpAndroid();
 
-  virtual void Run(Delegate* delegate) OVERRIDE;
-  virtual void Quit() OVERRIDE;
-  virtual void ScheduleWork() OVERRIDE;
+  virtual void Run(Delegate* delegate) override;
+  virtual void Quit() override;
+  virtual void ScheduleWork() override;
   virtual void ScheduleDelayedWork(
-      const base::TimeTicks& delayed_work_time) OVERRIDE;
-  virtual void Start(Delegate* delegate) OVERRIDE;
+      const base::TimeTicks& delayed_work_time) override;
+  virtual void Start(Delegate* delegate) override;
 
   static bool RegisterJni(JNIEnv* env);
 
diff --git a/content/public/test/render_view_test.h b/content/public/test/render_view_test.h
index 3fefec5..65bd63b 100644
--- a/content/public/test/render_view_test.h
+++ b/content/public/test/render_view_test.h
@@ -132,9 +132,9 @@ class RenderViewTest : public testing::Test {
   virtual ContentRendererClient* CreateContentRendererClient();
 
   // testing::Test
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
-  virtual void TearDown() OVERRIDE;
+  virtual void TearDown() override;
 
   base::MessageLoop msg_loop_;
   scoped_ptr<MockRenderProcess> mock_process_;
diff --git a/content/public/test/test_browser_context.cc b/content/public/test/test_browser_context.cc
index e4f3c03..8d7c577 100644
--- a/content/public/test/test_browser_context.cc
+++ b/content/public/test/test_browser_context.cc
@@ -21,12 +21,12 @@ class TestContextURLRequestContextGetter : public net::URLRequestContextGetter {
       : null_task_runner_(new base::NullTaskRunner) {
   }
 
-  virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE {
+  virtual net::URLRequestContext* GetURLRequestContext() override {
     return &context_;
   }
 
   virtual scoped_refptr<base::SingleThreadTaskRunner>
-      GetNetworkTaskRunner() const OVERRIDE {
+      GetNetworkTaskRunner() const override {
     return null_task_runner_;
   }
 
diff --git a/content/public/test/test_browser_context.h b/content/public/test/test_browser_context.h
index 077342b..35ab50e 100644
--- a/content/public/test/test_browser_context.h
+++ b/content/public/test/test_browser_context.h
@@ -27,24 +27,24 @@ class TestBrowserContext : public BrowserContext {
 
   void SetSpecialStoragePolicy(storage::SpecialStoragePolicy* policy);
 
-  virtual base::FilePath GetPath() const OVERRIDE;
-  virtual bool IsOffTheRecord() const OVERRIDE;
-  virtual DownloadManagerDelegate* GetDownloadManagerDelegate() OVERRIDE;
-  virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;
+  virtual base::FilePath GetPath() const override;
+  virtual bool IsOffTheRecord() const override;
+  virtual DownloadManagerDelegate* GetDownloadManagerDelegate() override;
+  virtual net::URLRequestContextGetter* GetRequestContext() override;
   virtual net::URLRequestContextGetter* GetRequestContextForRenderProcess(
-      int renderer_child_id) OVERRIDE;
-  virtual net::URLRequestContextGetter* GetMediaRequestContext() OVERRIDE;
+      int renderer_child_id) override;
+  virtual net::URLRequestContextGetter* GetMediaRequestContext() override;
   virtual net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess(
-      int renderer_child_id) OVERRIDE;
+      int renderer_child_id) override;
   virtual net::URLRequestContextGetter*
       GetMediaRequestContextForStoragePartition(
           const base::FilePath& partition_path,
-          bool in_memory) OVERRIDE;
-  virtual ResourceContext* GetResourceContext() OVERRIDE;
-  virtual BrowserPluginGuestManager* GetGuestManager() OVERRIDE;
-  virtual storage::SpecialStoragePolicy* GetSpecialStoragePolicy() OVERRIDE;
-  virtual PushMessagingService* GetPushMessagingService() OVERRIDE;
-  virtual SSLHostStateDelegate* GetSSLHostStateDelegate() OVERRIDE;
+          bool in_memory) override;
+  virtual ResourceContext* GetResourceContext() override;
+  virtual BrowserPluginGuestManager* GetGuestManager() override;
+  virtual storage::SpecialStoragePolicy* GetSpecialStoragePolicy() override;
+  virtual PushMessagingService* GetPushMessagingService() override;
+  virtual SSLHostStateDelegate* GetSSLHostStateDelegate() override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(DOMStorageTest, SessionOnly);
diff --git a/content/public/test/test_browser_thread.cc b/content/public/test/test_browser_thread.cc
index b4fc132..ac3311c 100644
--- a/content/public/test/test_browser_thread.cc
+++ b/content/public/test/test_browser_thread.cc
@@ -27,12 +27,12 @@ class TestBrowserThreadImpl : public BrowserThreadImpl {
     Stop();
   }
 
-  virtual void Init() OVERRIDE {
+  virtual void Init() override {
     notification_service_ = new NotificationServiceImpl;
     BrowserThreadImpl::Init();
   }
 
-  virtual void CleanUp() OVERRIDE {
+  virtual void CleanUp() override {
     delete notification_service_;
     notification_service_ = NULL;
     BrowserThreadImpl::CleanUp();
diff --git a/content/public/test/test_file_error_injector.cc b/content/public/test/test_file_error_injector.cc
index 4401562..069c623 100644
--- a/content/public/test/test_file_error_injector.cc
+++ b/content/public/test/test_file_error_injector.cc
@@ -42,17 +42,17 @@ class DownloadFileWithErrors: public DownloadFileImpl {
 
   virtual ~DownloadFileWithErrors();
 
-  virtual void Initialize(const InitializeCallback& callback) OVERRIDE;
+  virtual void Initialize(const InitializeCallback& callback) override;
 
   // DownloadFile interface.
   virtual DownloadInterruptReason AppendDataToFile(
-      const char* data, size_t data_len) OVERRIDE;
+      const char* data, size_t data_len) override;
   virtual void RenameAndUniquify(
       const base::FilePath& full_path,
-      const RenameCompletionCallback& callback) OVERRIDE;
+      const RenameCompletionCallback& callback) override;
   virtual void RenameAndAnnotate(
       const base::FilePath& full_path,
-      const RenameCompletionCallback& callback) OVERRIDE;
+      const RenameCompletionCallback& callback) override;
 
  private:
   // Error generating helper.
@@ -265,7 +265,7 @@ class DownloadFileWithErrorsFactory : public DownloadFileFactory {
       bool calculate_hash,
       scoped_ptr<ByteStreamReader> stream,
       const net::BoundNetLog& bound_net_log,
-      base::WeakPtr<DownloadDestinationObserver> observer) OVERRIDE;
+      base::WeakPtr<DownloadDestinationObserver> observer) override;
 
   bool AddError(
       const TestFileErrorInjector::FileErrorInfo& error_info);
diff --git a/content/public/test/test_file_system_backend.cc b/content/public/test/test_file_system_backend.cc
index 2840d32..36cde69 100644
--- a/content/public/test/test_file_system_backend.cc
+++ b/content/public/test/test_file_system_backend.cc
@@ -48,7 +48,7 @@ class TestFileUtil : public storage::LocalFileUtil {
   virtual base::File::Error GetLocalFilePath(
       FileSystemOperationContext* context,
       const FileSystemURL& file_system_url,
-      base::FilePath* local_file_path) OVERRIDE {
+      base::FilePath* local_file_path) override {
     *local_file_path = base_path_.Append(file_system_url.path());
     return base::File::FILE_OK;
   }
@@ -65,21 +65,21 @@ class TestWatcherManager : public storage::WatcherManager {
   virtual ~TestWatcherManager() {}
 
   // storage::WatcherManager overrides.
-  virtual void AddObserver(Observer* observer) OVERRIDE {
+  virtual void AddObserver(Observer* observer) override {
     observers_.AddObserver(observer);
   }
 
-  virtual void RemoveObserver(Observer* observer) OVERRIDE {
+  virtual void RemoveObserver(Observer* observer) override {
     observers_.RemoveObserver(observer);
   }
 
-  virtual bool HasObserver(Observer* observer) const OVERRIDE {
+  virtual bool HasObserver(Observer* observer) const override {
     return observers_.HasObserver(observer);
   }
 
   virtual void WatchDirectory(const storage::FileSystemURL& url,
                               bool recursive,
-                              const StatusCallback& callback) OVERRIDE {
+                              const StatusCallback& callback) override {
     if (recursive) {
       base::ThreadTaskRunnerHandle::Get()->PostTask(
           FROM_HERE,
@@ -114,7 +114,7 @@ class TestWatcherManager : public storage::WatcherManager {
   }
 
   virtual void UnwatchEntry(const storage::FileSystemURL& url,
-                            const StatusCallback& callback) OVERRIDE {
+                            const StatusCallback& callback) override {
     const GURL gurl = url.ToGURL();
     if (watched_urls_.find(gurl) == watched_urls_.end()) {
       base::ThreadTaskRunnerHandle::Get()->PostTask(
@@ -166,7 +166,7 @@ class TestFileSystemBackend::QuotaUtil : public storage::FileSystemQuotaUtil,
       FileSystemContext* context,
       storage::QuotaManagerProxy* proxy,
       const GURL& origin_url,
-      storage::FileSystemType type) OVERRIDE {
+      storage::FileSystemType type) override {
     NOTREACHED();
     return base::File::FILE_OK;
   }
@@ -174,37 +174,37 @@ class TestFileSystemBackend::QuotaUtil : public storage::FileSystemQuotaUtil,
   virtual scoped_refptr<storage::QuotaReservation>
   CreateQuotaReservationOnFileTaskRunner(
       const GURL& origin_url,
-      storage::FileSystemType type) OVERRIDE {
+      storage::FileSystemType type) override {
     NOTREACHED();
     return scoped_refptr<storage::QuotaReservation>();
   }
 
   virtual void GetOriginsForTypeOnFileTaskRunner(
       storage::FileSystemType type,
-      std::set<GURL>* origins) OVERRIDE {
+      std::set<GURL>* origins) override {
     NOTREACHED();
   }
 
   virtual void GetOriginsForHostOnFileTaskRunner(
       storage::FileSystemType type,
       const std::string& host,
-      std::set<GURL>* origins) OVERRIDE {
+      std::set<GURL>* origins) override {
     NOTREACHED();
   }
 
   virtual int64 GetOriginUsageOnFileTaskRunner(
       FileSystemContext* context,
       const GURL& origin_url,
-      storage::FileSystemType type) OVERRIDE {
+      storage::FileSystemType type) override {
     return usage_;
   }
 
   // FileUpdateObserver overrides.
-  virtual void OnStartUpdate(const FileSystemURL& url) OVERRIDE {}
-  virtual void OnUpdate(const FileSystemURL& url, int64 delta) OVERRIDE {
+  virtual void OnStartUpdate(const FileSystemURL& url) override {}
+  virtual void OnUpdate(const FileSystemURL& url, int64 delta) override {
     usage_ += delta;
   }
-  virtual void OnEndUpdate(const FileSystemURL& url) OVERRIDE {}
+  virtual void OnEndUpdate(const FileSystemURL& url) override {}
 
  private:
   int64 usage_;
diff --git a/content/public/test/test_file_system_backend.h b/content/public/test/test_file_system_backend.h
index 0025bff..dbb9942 100644
--- a/content/public/test/test_file_system_backend.h
+++ b/content/public/test/test_file_system_backend.h
@@ -34,43 +34,43 @@ class TestFileSystemBackend : public storage::FileSystemBackend {
   virtual ~TestFileSystemBackend();
 
   // FileSystemBackend implementation.
-  virtual bool CanHandleType(storage::FileSystemType type) const OVERRIDE;
-  virtual void Initialize(storage::FileSystemContext* context) OVERRIDE;
+  virtual bool CanHandleType(storage::FileSystemType type) const override;
+  virtual void Initialize(storage::FileSystemContext* context) override;
   virtual void ResolveURL(const storage::FileSystemURL& url,
                           storage::OpenFileSystemMode mode,
-                          const OpenFileSystemCallback& callback) OVERRIDE;
+                          const OpenFileSystemCallback& callback) override;
   virtual storage::AsyncFileUtil* GetAsyncFileUtil(
-      storage::FileSystemType type) OVERRIDE;
+      storage::FileSystemType type) override;
   virtual storage::WatcherManager* GetWatcherManager(
-      storage::FileSystemType type) OVERRIDE;
+      storage::FileSystemType type) override;
   virtual storage::CopyOrMoveFileValidatorFactory*
       GetCopyOrMoveFileValidatorFactory(storage::FileSystemType type,
-                                        base::File::Error* error_code) OVERRIDE;
+                                        base::File::Error* error_code) override;
   virtual storage::FileSystemOperation* CreateFileSystemOperation(
       const storage::FileSystemURL& url,
       storage::FileSystemContext* context,
-      base::File::Error* error_code) const OVERRIDE;
+      base::File::Error* error_code) const override;
   virtual bool SupportsStreaming(
-      const storage::FileSystemURL& url) const OVERRIDE;
+      const storage::FileSystemURL& url) const override;
   virtual bool HasInplaceCopyImplementation(
-      storage::FileSystemType type) const OVERRIDE;
+      storage::FileSystemType type) const override;
   virtual scoped_ptr<storage::FileStreamReader> CreateFileStreamReader(
       const storage::FileSystemURL& url,
       int64 offset,
       int64 max_bytes_to_read,
       const base::Time& expected_modification_time,
-      storage::FileSystemContext* context) const OVERRIDE;
+      storage::FileSystemContext* context) const override;
   virtual scoped_ptr<storage::FileStreamWriter> CreateFileStreamWriter(
       const storage::FileSystemURL& url,
       int64 offset,
-      storage::FileSystemContext* context) const OVERRIDE;
-  virtual storage::FileSystemQuotaUtil* GetQuotaUtil() OVERRIDE;
+      storage::FileSystemContext* context) const override;
+  virtual storage::FileSystemQuotaUtil* GetQuotaUtil() override;
   virtual const storage::UpdateObserverList* GetUpdateObservers(
-      storage::FileSystemType type) const OVERRIDE;
+      storage::FileSystemType type) const override;
   virtual const storage::ChangeObserverList* GetChangeObservers(
-      storage::FileSystemType type) const OVERRIDE;
+      storage::FileSystemType type) const override;
   virtual const storage::AccessObserverList* GetAccessObservers(
-      storage::FileSystemType type) const OVERRIDE;
+      storage::FileSystemType type) const override;
 
   // Initialize the CopyOrMoveFileValidatorFactory. Invalid to call more than
   // once.
diff --git a/content/public/test/test_launcher.cc b/content/public/test/test_launcher.cc
index 77392b0..32de882 100644
--- a/content/public/test/test_launcher.cc
+++ b/content/public/test/test_launcher.cc
@@ -120,12 +120,12 @@ class WrapperTestLauncherDelegate : public base::TestLauncherDelegate {
 
   // base::TestLauncherDelegate:
   virtual bool ShouldRunTest(const testing::TestCase* test_case,
-                             const testing::TestInfo* test_info) OVERRIDE;
+                             const testing::TestInfo* test_info) override;
   virtual size_t RunTests(base::TestLauncher* test_launcher,
-                          const std::vector<std::string>& test_names) OVERRIDE;
+                          const std::vector<std::string>& test_names) override;
   virtual size_t RetryTests(
       base::TestLauncher* test_launcher,
-      const std::vector<std::string>& test_names) OVERRIDE;
+      const std::vector<std::string>& test_names) override;
 
  private:
   void DoRunTest(base::TestLauncher* test_launcher,
diff --git a/content/public/test/test_navigation_observer.cc b/content/public/test/test_navigation_observer.cc
index bfe74f6..e8955aa 100644
--- a/content/public/test/test_navigation_observer.cc
+++ b/content/public/test/test_navigation_observer.cc
@@ -26,23 +26,23 @@ class TestNavigationObserver::TestWebContentsObserver
  private:
   // WebContentsObserver:
   virtual void NavigationEntryCommitted(
-      const LoadCommittedDetails& load_details) OVERRIDE {
+      const LoadCommittedDetails& load_details) override {
     parent_->OnNavigationEntryCommitted(this, web_contents(), load_details);
   }
 
-  virtual void DidAttachInterstitialPage() OVERRIDE {
+  virtual void DidAttachInterstitialPage() override {
     parent_->OnDidAttachInterstitialPage(web_contents());
   }
 
-  virtual void WebContentsDestroyed() OVERRIDE {
+  virtual void WebContentsDestroyed() override {
     parent_->OnWebContentsDestroyed(this, web_contents());
   }
 
-  virtual void DidStartLoading(RenderViewHost* render_view_host) OVERRIDE {
+  virtual void DidStartLoading(RenderViewHost* render_view_host) override {
     parent_->OnDidStartLoading(web_contents());
   }
 
-  virtual void DidStopLoading(RenderViewHost* render_view_host) OVERRIDE {
+  virtual void DidStopLoading(RenderViewHost* render_view_host) override {
     parent_->OnDidStopLoading(web_contents());
   }
 
diff --git a/content/public/test/test_notification_tracker.h b/content/public/test/test_notification_tracker.h
index f34fdae..69d59fa 100644
--- a/content/public/test/test_notification_tracker.h
+++ b/content/public/test/test_notification_tracker.h
@@ -71,7 +71,7 @@ class TestNotificationTracker : public NotificationObserver {
  protected:
   virtual void Observe(int type,
                        const NotificationSource& source,
-                       const NotificationDetails& details) OVERRIDE;
+                       const NotificationDetails& details) override;
  private:
   NotificationRegistrar registrar_;
 
diff --git a/content/public/test/test_renderer_host.h b/content/public/test/test_renderer_host.h
index c697656..719caa5 100644
--- a/content/public/test/test_renderer_host.h
+++ b/content/public/test/test_renderer_host.h
@@ -203,8 +203,8 @@ class RenderViewHostTestHarness : public testing::Test {
 
  protected:
   // testing::Test
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   // Derived classes should override this method to use a custom BrowserContext.
   // It is invoked by SetUp after threads were started.
diff --git a/content/public/test/test_utils.cc b/content/public/test/test_utils.cc
index 53d5055..136ffbe 100644
--- a/content/public/test/test_utils.cc
+++ b/content/public/test/test_utils.cc
@@ -77,9 +77,9 @@ class TaskObserver : public base::MessageLoop::TaskObserver {
   virtual ~TaskObserver() {}
 
   // MessageLoop::TaskObserver overrides.
-  virtual void WillProcessTask(const base::PendingTask& pending_task) OVERRIDE {
+  virtual void WillProcessTask(const base::PendingTask& pending_task) override {
   }
-  virtual void DidProcessTask(const base::PendingTask& pending_task) OVERRIDE {
+  virtual void DidProcessTask(const base::PendingTask& pending_task) override {
     processed_ = true;
   }
 
diff --git a/content/public/test/test_utils.h b/content/public/test/test_utils.h
index 9a6c8a4..230f477 100644
--- a/content/public/test/test_utils.h
+++ b/content/public/test/test_utils.h
@@ -174,7 +174,7 @@ class WindowedNotificationObserver : public NotificationObserver {
   // NotificationObserver:
   virtual void Observe(int type,
                        const NotificationSource& source,
-                       const NotificationDetails& details) OVERRIDE;
+                       const NotificationDetails& details) override;
 
  private:
   bool seen_;
@@ -208,9 +208,9 @@ class InProcessUtilityThreadHelper : public BrowserChildProcessObserver {
 
  private:
   virtual void BrowserChildProcessHostConnected(
-      const ChildProcessData& data) OVERRIDE;
+      const ChildProcessData& data) override;
   virtual void BrowserChildProcessHostDisconnected(
-      const ChildProcessData& data) OVERRIDE;
+      const ChildProcessData& data) override;
 
   int child_thread_count_;
   scoped_refptr<MessageLoopRunner> runner_;