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

BUG=417463

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

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

45 files changed, 215 insertions, 215 deletions

diff --git a/content/test/appcache_test_helper.h b/content/test/appcache_test_helper.h
index 3b6f6c9..94747ee 100644
--- a/content/test/appcache_test_helper.h
+++ b/content/test/appcache_test_helper.h
@@ -31,7 +31,7 @@ class AppCacheTestHelper : public AppCacheStorage::Delegate {
       AppCacheGroup* group,
       AppCache* newest_cache,
       bool success,
-      bool would_exceed_quota) OVERRIDE;
+      bool would_exceed_quota) override;
   void OnGotAppCacheInfo(int rv);
 
   int group_id_;
diff --git a/content/test/browser_test_utils_browsertest.cc b/content/test/browser_test_utils_browsertest.cc
index cf68659..2bde9cc 100644
--- a/content/test/browser_test_utils_browsertest.cc
+++ b/content/test/browser_test_utils_browsertest.cc
@@ -21,13 +21,13 @@ class NavigationObserver: public WebContentsObserver {
   virtual void DidCommitProvisionalLoadForFrame(
       RenderFrameHost* render_frame_host,
       const GURL& url,
-      ui::PageTransition transition_type) OVERRIDE {
+      ui::PageTransition transition_type) override {
     navigation_url_ = url;
   }
 
   virtual void DidGetRedirectForResourceRequest(
       RenderViewHost* render_view_host,
-      const ResourceRedirectDetails& details) OVERRIDE {
+      const ResourceRedirectDetails& details) override {
     redirect_url_ = details.new_url;
   }
 
diff --git a/content/test/content_browser_test_test.cc b/content/test/content_browser_test_test.cc
index 1714f0b..a10b633 100644
--- a/content/test/content_browser_test_test.cc
+++ b/content/test/content_browser_test_test.cc
@@ -21,7 +21,7 @@ IN_PROC_BROWSER_TEST_F(ContentBrowserTest, MANUAL_ShouldntRun) {
 
 class ContentBrowserTestSanityTest : public ContentBrowserTest {
  public:
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     const testing::TestInfo* const test_info =
         testing::UnitTest::GetInstance()->current_test_info();
     if (std::string(test_info->name()) == "SingleProcess")
diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc
index 9223442..6990fe9 100644
--- a/content/test/content_test_launcher.cc
+++ b/content/test/content_test_launcher.cc
@@ -49,7 +49,7 @@ class ContentBrowserTestSuite : public ContentTestSuiteBase {
   }
 
  protected:
-  virtual void Initialize() OVERRIDE {
+  virtual void Initialize() override {
 
 #if defined(OS_ANDROID)
     base::i18n::AllowMultipleInitializeCallsForTesting();
@@ -93,12 +93,12 @@ class ContentTestLauncherDelegate : public TestLauncherDelegate {
   ContentTestLauncherDelegate() {}
   virtual ~ContentTestLauncherDelegate() {}
 
-  virtual int RunTestSuite(int argc, char** argv) OVERRIDE {
+  virtual int RunTestSuite(int argc, char** argv) override {
     return ContentBrowserTestSuite(argc, argv).Run();
   }
 
   virtual bool AdjustChildProcessCommandLine(
-      CommandLine* command_line, const base::FilePath& temp_data_dir) OVERRIDE {
+      CommandLine* command_line, const base::FilePath& temp_data_dir) override {
     command_line->AppendSwitchPath(switches::kContentShellDataPath,
                                    temp_data_dir);
     command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream);
@@ -107,7 +107,7 @@ class ContentTestLauncherDelegate : public TestLauncherDelegate {
   }
 
  protected:
-  virtual ContentMainDelegate* CreateContentMainDelegate() OVERRIDE {
+  virtual ContentMainDelegate* CreateContentMainDelegate() override {
     return new ShellMainDelegate();
   }
 
diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc
index 6553b67..4b7083a 100644
--- a/content/test/content_test_suite.cc
+++ b/content/test/content_test_suite.cc
@@ -34,12 +34,12 @@ class TestInitializationListener : public testing::EmptyTestEventListener {
   TestInitializationListener() : test_content_client_initializer_(NULL) {
   }
 
-  virtual void OnTestStart(const testing::TestInfo& test_info) OVERRIDE {
+  virtual void OnTestStart(const testing::TestInfo& test_info) override {
     test_content_client_initializer_ =
         new content::TestContentClientInitializer();
   }
 
-  virtual void OnTestEnd(const testing::TestInfo& test_info) OVERRIDE {
+  virtual void OnTestEnd(const testing::TestInfo& test_info) override {
     delete test_content_client_initializer_;
   }
 
diff --git a/content/test/content_test_suite.h b/content/test/content_test_suite.h
index f282f4e..3203fef 100644
--- a/content/test/content_test_suite.h
+++ b/content/test/content_test_suite.h
@@ -20,7 +20,7 @@ class ContentTestSuite : public ContentTestSuiteBase {
   virtual ~ContentTestSuite();
 
  protected:
-  virtual void Initialize() OVERRIDE;
+  virtual void Initialize() override;
 
  private:
 #if defined(OS_WIN)
diff --git a/content/test/image_decoder_test.h b/content/test/image_decoder_test.h
index 379cf4e..a9eca20 100644
--- a/content/test/image_decoder_test.h
+++ b/content/test/image_decoder_test.h
@@ -41,7 +41,7 @@ class ImageDecoderTest : public testing::Test {
   explicit ImageDecoderTest(const std::string& format) : format_(format) { }
 
  protected:
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   // Returns the vector of image files for testing.
   std::vector<base::FilePath> GetImageFiles() const;
diff --git a/content/test/mock_google_streaming_server.h b/content/test/mock_google_streaming_server.h
index 43383e3..b8064c1 100644
--- a/content/test/mock_google_streaming_server.h
+++ b/content/test/mock_google_streaming_server.h
@@ -32,9 +32,9 @@ class MockGoogleStreamingServer : public net::TestURLFetcherDelegateForTests {
   virtual ~MockGoogleStreamingServer();
 
   // net::TestURLFetcherDelegateForTests implementation.
-  virtual void OnRequestStart(int fetcher_id) OVERRIDE;
-  virtual void OnChunkUpload(int fetcher_id) OVERRIDE;
-  virtual void OnRequestEnd(int fetcher_id) OVERRIDE;
+  virtual void OnRequestStart(int fetcher_id) override;
+  virtual void OnChunkUpload(int fetcher_id) override;
+  virtual void OnRequestEnd(int fetcher_id) override;
 
   void SimulateResult(const content::SpeechRecognitionResult& result);
   void SimulateServerFailure();
diff --git a/content/test/mock_render_process.h b/content/test/mock_render_process.h
index 9c480da..6068dba 100644
--- a/content/test/mock_render_process.h
+++ b/content/test/mock_render_process.h
@@ -16,8 +16,8 @@ class MockRenderProcess : public RenderProcess {
   virtual ~MockRenderProcess();
 
   // RenderProcess implementation.
-  virtual void AddBindings(int bindings) OVERRIDE;
-  virtual int GetEnabledBindings() const OVERRIDE;
+  virtual void AddBindings(int bindings) override;
+  virtual int GetEnabledBindings() const override;
 
  private:
   int enabled_bindings_;
diff --git a/content/test/net/url_request_abort_on_end_job.h b/content/test/net/url_request_abort_on_end_job.h
index fd31e07..973180d 100644
--- a/content/test/net/url_request_abort_on_end_job.h
+++ b/content/test/net/url_request_abort_on_end_job.h
@@ -26,12 +26,12 @@ class URLRequestAbortOnEndJob : public net::URLRequestJob {
                           net::NetworkDelegate* network_delegate);
 
   // net::URLRequestJob
-  virtual void Start() OVERRIDE;
-  virtual bool GetMimeType(std::string* mime_type) const OVERRIDE;
-  virtual void GetResponseInfo(net::HttpResponseInfo* info) OVERRIDE;
+  virtual void Start() override;
+  virtual bool GetMimeType(std::string* mime_type) const override;
+  virtual void GetResponseInfo(net::HttpResponseInfo* info) override;
   virtual bool ReadRawData(net::IOBuffer* buf,
                            int buf_size,
-                           int* bytes_read) OVERRIDE;
+                           int* bytes_read) override;
 
   static void AddUrlHandler();
 
diff --git a/content/test/net/url_request_slow_download_job.h b/content/test/net/url_request_slow_download_job.h
index 02703b3..78faa384 100644
--- a/content/test/net/url_request_slow_download_job.h
+++ b/content/test/net/url_request_slow_download_job.h
@@ -35,12 +35,12 @@ class URLRequestSlowDownloadJob : public net::URLRequestJob {
   void CheckDoneStatus();
 
   // net::URLRequestJob methods
-  virtual void Start() OVERRIDE;
-  virtual bool GetMimeType(std::string* mime_type) const OVERRIDE;
-  virtual void GetResponseInfo(net::HttpResponseInfo* info) OVERRIDE;
+  virtual void Start() override;
+  virtual bool GetMimeType(std::string* mime_type) const override;
+  virtual void GetResponseInfo(net::HttpResponseInfo* info) override;
   virtual bool ReadRawData(net::IOBuffer* buf,
                            int buf_size,
-                           int *bytes_read) OVERRIDE;
+                           int *bytes_read) override;
 
   static net::URLRequestJob* Factory(net::URLRequest* request,
                                      net::NetworkDelegate* network_delegate,
diff --git a/content/test/plugin/plugin_arguments_test.h b/content/test/plugin/plugin_arguments_test.h
index 7241b76..87ab14d 100644
--- a/content/test/plugin/plugin_arguments_test.h
+++ b/content/test/plugin/plugin_arguments_test.h
@@ -33,10 +33,10 @@ class PluginArgumentsTest : public PluginTest {
 
   // Initialize this PluginTest based on the arguments from NPP_New.
   virtual NPError  New(uint16 mode, int16 argc, const char* argn[],
-                       const char* argv[], NPSavedData* saved) OVERRIDE;
+                       const char* argv[], NPSavedData* saved) override;
 
   // NPAPI SetWindow handler.
-  virtual NPError SetWindow(NPWindow* pNPWindow) OVERRIDE;
+  virtual NPError SetWindow(NPWindow* pNPWindow) override;
 };
 
 }  // namespace NPAPIClient
diff --git a/content/test/plugin/plugin_delete_plugin_in_deallocate_test.h b/content/test/plugin/plugin_delete_plugin_in_deallocate_test.h
index d04fd00..3538360 100644
--- a/content/test/plugin/plugin_delete_plugin_in_deallocate_test.h
+++ b/content/test/plugin/plugin_delete_plugin_in_deallocate_test.h
@@ -20,8 +20,8 @@ class DeletePluginInDeallocateTest : public PluginTest {
   DeletePluginInDeallocateTest(NPP id, NPNetscapeFuncs* host_functions);
 
   // NPAPI handlers.
-  virtual NPError SetWindow(NPWindow* pNPWindow) OVERRIDE;
-  virtual NPError Destroy() OVERRIDE;
+  virtual NPError SetWindow(NPWindow* pNPWindow) override;
+  virtual NPError Destroy() override;
 
   NPObject* npobject_;
   bool test_started_;
diff --git a/content/test/plugin/plugin_delete_plugin_in_stream_test.h b/content/test/plugin/plugin_delete_plugin_in_stream_test.h
index 646d5d6..4a32298 100644
--- a/content/test/plugin/plugin_delete_plugin_in_stream_test.h
+++ b/content/test/plugin/plugin_delete_plugin_in_stream_test.h
@@ -18,9 +18,9 @@ class DeletePluginInStreamTest : public PluginTest {
   //
   // NPAPI functions
   //
-  virtual NPError SetWindow(NPWindow* pNPWindow) OVERRIDE;
+  virtual NPError SetWindow(NPWindow* pNPWindow) override;
   virtual NPError NewStream(NPMIMEType type, NPStream* stream,
-                            NPBool seekable, uint16* stype) OVERRIDE;
+                            NPBool seekable, uint16* stype) override;
  private:
   bool test_started_;
   std::string self_url_;
diff --git a/content/test/plugin/plugin_execute_stream_javascript.h b/content/test/plugin/plugin_execute_stream_javascript.h
index 6a3996e..2c0de0b 100644
--- a/content/test/plugin/plugin_execute_stream_javascript.h
+++ b/content/test/plugin/plugin_execute_stream_javascript.h
@@ -20,11 +20,11 @@ class ExecuteStreamJavaScript : public PluginTest {
   // NPAPI functions
   //
   virtual NPError NewStream(NPMIMEType type, NPStream* stream,
-                            NPBool seekable, uint16* stype) OVERRIDE;
-  virtual int32   WriteReady(NPStream *stream) OVERRIDE;
+                            NPBool seekable, uint16* stype) override;
+  virtual int32   WriteReady(NPStream *stream) override;
   virtual int32   Write(NPStream *stream, int32 offset, int32 len,
-                        void *buffer) OVERRIDE;
-  virtual NPError DestroyStream(NPStream *stream, NPError reason) OVERRIDE;
+                        void *buffer) override;
+  virtual NPError DestroyStream(NPStream *stream, NPError reason) override;
 };
 
 }  // namespace NPAPIClient
diff --git a/content/test/plugin/plugin_get_javascript_url2_test.h b/content/test/plugin/plugin_get_javascript_url2_test.h
index 8d6f552..450cfd1 100644
--- a/content/test/plugin/plugin_get_javascript_url2_test.h
+++ b/content/test/plugin/plugin_get_javascript_url2_test.h
@@ -20,16 +20,16 @@ class ExecuteGetJavascriptUrl2Test : public PluginTest {
   //
   // NPAPI functions
   //
-  virtual NPError SetWindow(NPWindow* pNPWindow) OVERRIDE;
+  virtual NPError SetWindow(NPWindow* pNPWindow) override;
   virtual NPError NewStream(NPMIMEType type, NPStream* stream,
-                            NPBool seekable, uint16* stype) OVERRIDE;
-  virtual int32   WriteReady(NPStream *stream) OVERRIDE;
+                            NPBool seekable, uint16* stype) override;
+  virtual int32   WriteReady(NPStream *stream) override;
   virtual int32   Write(NPStream *stream, int32 offset, int32 len,
-                        void *buffer) OVERRIDE;
-  virtual NPError DestroyStream(NPStream *stream, NPError reason) OVERRIDE;
+                        void *buffer) override;
+  virtual NPError DestroyStream(NPStream *stream, NPError reason) override;
   virtual void    URLNotify(const char* url,
                             NPReason reason,
-                            void* data) OVERRIDE;
+                            void* data) override;
 
  private:
   bool test_started_;
diff --git a/content/test/plugin/plugin_get_javascript_url_test.h b/content/test/plugin/plugin_get_javascript_url_test.h
index e2e176c..a7f1043 100644
--- a/content/test/plugin/plugin_get_javascript_url_test.h
+++ b/content/test/plugin/plugin_get_javascript_url_test.h
@@ -19,16 +19,16 @@ class ExecuteGetJavascriptUrlTest : public PluginTest {
   //
   // NPAPI functions
   //
-  virtual NPError SetWindow(NPWindow* pNPWindow) OVERRIDE;
+  virtual NPError SetWindow(NPWindow* pNPWindow) override;
   virtual NPError NewStream(NPMIMEType type, NPStream* stream,
-                            NPBool seekable, uint16* stype) OVERRIDE;
-  virtual int32   WriteReady(NPStream *stream) OVERRIDE;
+                            NPBool seekable, uint16* stype) override;
+  virtual int32   WriteReady(NPStream *stream) override;
   virtual int32   Write(NPStream *stream, int32 offset, int32 len,
-                        void *buffer) OVERRIDE;
-  virtual NPError DestroyStream(NPStream *stream, NPError reason) OVERRIDE;
+                        void *buffer) override;
+  virtual NPError DestroyStream(NPStream *stream, NPError reason) override;
   virtual void    URLNotify(const char* url,
                             NPReason reason,
-                            void* data) OVERRIDE;
+                            void* data) override;
 
  private:
 #if defined(OS_WIN)
diff --git a/content/test/plugin/plugin_geturl_test.h b/content/test/plugin/plugin_geturl_test.h
index 6d85540..48a7e74 100644
--- a/content/test/plugin/plugin_geturl_test.h
+++ b/content/test/plugin/plugin_geturl_test.h
@@ -28,19 +28,19 @@ class PluginGetURLTest : public PluginTest {
   // NPAPI functions
   //
   virtual NPError New(uint16 mode, int16 argc, const char* argn[],
-                      const char* argv[], NPSavedData* saved) OVERRIDE;
-  virtual NPError SetWindow(NPWindow* pNPWindow) OVERRIDE;
+                      const char* argv[], NPSavedData* saved) override;
+  virtual NPError SetWindow(NPWindow* pNPWindow) override;
   virtual NPError NewStream(NPMIMEType type, NPStream* stream,
-                            NPBool seekable, uint16* stype) OVERRIDE;
-  virtual int32   WriteReady(NPStream *stream) OVERRIDE;
+                            NPBool seekable, uint16* stype) override;
+  virtual int32   WriteReady(NPStream *stream) override;
   virtual int32   Write(NPStream *stream, int32 offset, int32 len,
-                        void *buffer) OVERRIDE;
-  virtual NPError DestroyStream(NPStream *stream, NPError reason) OVERRIDE;
-  virtual void    StreamAsFile(NPStream* stream, const char* fname) OVERRIDE;
+                        void *buffer) override;
+  virtual NPError DestroyStream(NPStream *stream, NPError reason) override;
+  virtual void    StreamAsFile(NPStream* stream, const char* fname) override;
   virtual void    URLNotify(const char* url, NPReason reason,
-                            void* data) OVERRIDE;
+                            void* data) override;
   virtual void    URLRedirectNotify(const char* url, int32_t status,
-                                    void* notify_data) OVERRIDE;
+                                    void* notify_data) override;
 
  private:
   bool tests_started_;
diff --git a/content/test/plugin/plugin_javascript_open_popup.h b/content/test/plugin/plugin_javascript_open_popup.h
index 1bc764e..f6a4a87 100644
--- a/content/test/plugin/plugin_javascript_open_popup.h
+++ b/content/test/plugin/plugin_javascript_open_popup.h
@@ -19,7 +19,7 @@ class ExecuteJavascriptOpenPopupWithPluginTest : public PluginTest {
   ExecuteJavascriptOpenPopupWithPluginTest(
       NPP id, NPNetscapeFuncs *host_functions);
   // NPAPI SetWindow handler.
-  virtual NPError SetWindow(NPWindow* window) OVERRIDE;
+  virtual NPError SetWindow(NPWindow* window) override;
 
  private:
   bool popup_window_test_started_;
@@ -32,7 +32,7 @@ class ExecuteJavascriptPopupWindowTargetPluginTest : public PluginTest {
   ExecuteJavascriptPopupWindowTargetPluginTest(
       NPP id, NPNetscapeFuncs *host_functions);
   // NPAPI SetWindow handler.
-  virtual NPError SetWindow(NPWindow* window) OVERRIDE;
+  virtual NPError SetWindow(NPWindow* window) override;
 
  private:
   // Do a platform-specific validation of the passed-in |window|.
diff --git a/content/test/plugin/plugin_new_fails_test.h b/content/test/plugin/plugin_new_fails_test.h
index b6074f6..b130399 100644
--- a/content/test/plugin/plugin_new_fails_test.h
+++ b/content/test/plugin/plugin_new_fails_test.h
@@ -14,7 +14,7 @@ class NewFailsTest : public PluginTest {
  public:
   NewFailsTest(NPP id, NPNetscapeFuncs *host_functions);
   virtual NPError New(uint16 mode, int16 argc, const char* argn[],
-                      const char* argv[], NPSavedData* saved) OVERRIDE;
+                      const char* argv[], NPSavedData* saved) override;
 };
 
 }  // namespace NPAPIClient
diff --git a/content/test/plugin/plugin_npobject_identity_test.h b/content/test/plugin/plugin_npobject_identity_test.h
index 3f8b7bd..d1bcda2 100644
--- a/content/test/plugin/plugin_npobject_identity_test.h
+++ b/content/test/plugin/plugin_npobject_identity_test.h
@@ -19,7 +19,7 @@ class NPObjectIdentityTest : public PluginTest {
   NPObjectIdentityTest(NPP id, NPNetscapeFuncs *host_functions);
 
   // NPAPI SetWindow handler.
-  virtual NPError SetWindow(NPWindow* pNPWindow) OVERRIDE;
+  virtual NPError SetWindow(NPWindow* pNPWindow) override;
 };
 
 }  // namespace NPAPIClient
diff --git a/content/test/plugin/plugin_npobject_lifetime_test.h b/content/test/plugin/plugin_npobject_lifetime_test.h
index baf0ee8..09c2d06 100644
--- a/content/test/plugin/plugin_npobject_lifetime_test.h
+++ b/content/test/plugin/plugin_npobject_lifetime_test.h
@@ -21,11 +21,11 @@ class NPObjectLifetimeTest : public PluginTest {
   NPObjectLifetimeTest(NPP id, NPNetscapeFuncs *host_functions);
 
   // NPAPI SetWindow handler.
-  virtual NPError SetWindow(NPWindow* pNPWindow) OVERRIDE;
+  virtual NPError SetWindow(NPWindow* pNPWindow) override;
 
   virtual void  URLNotify(const char* url,
                           NPReason reason,
-                          void* data) OVERRIDE;
+                          void* data) override;
 
  protected:
   NPObject* other_plugin_instance_object_;
@@ -47,7 +47,7 @@ class NPObjectLifetimeTestInstance2 : public PluginTest {
   virtual ~NPObjectLifetimeTestInstance2();
 
   // NPAPI SetWindow handler.
-  virtual NPError SetWindow(NPWindow* pNPWindow) OVERRIDE;
+  virtual NPError SetWindow(NPWindow* pNPWindow) override;
  protected:
   static NPObject* plugin_instance_object_;
   friend class NPObjectLifetimeTest;
@@ -64,7 +64,7 @@ class NPObjectDeletePluginInNPN_Evaluate : public PluginTest {
   virtual ~NPObjectDeletePluginInNPN_Evaluate();
 
   // NPAPI SetWindow handler.
-  virtual NPError SetWindow(NPWindow* pNPWindow) OVERRIDE;
+  virtual NPError SetWindow(NPWindow* pNPWindow) override;
 
  protected:
   NPObject* plugin_instance_object_;
diff --git a/content/test/plugin/plugin_npobject_proxy_test.h b/content/test/plugin/plugin_npobject_proxy_test.h
index e732efd..a35a34c 100644
--- a/content/test/plugin/plugin_npobject_proxy_test.h
+++ b/content/test/plugin/plugin_npobject_proxy_test.h
@@ -20,7 +20,7 @@ class NPObjectProxyTest : public PluginTest {
   NPObjectProxyTest(NPP id, NPNetscapeFuncs *host_functions);
 
   // NPAPI SetWindow handler.
-  virtual NPError SetWindow(NPWindow* pNPWindow) OVERRIDE;
+  virtual NPError SetWindow(NPWindow* pNPWindow) override;
 };
 
 }  // namespace NPAPIClient
diff --git a/content/test/plugin/plugin_private_test.h b/content/test/plugin/plugin_private_test.h
index a382669..6a7fdb2 100644
--- a/content/test/plugin/plugin_private_test.h
+++ b/content/test/plugin/plugin_private_test.h
@@ -18,7 +18,7 @@ class PrivateTest : public PluginTest {
 
   // Initialize this PluginTest based on the arguments from NPP_New.
   virtual NPError New(uint16 mode, int16 argc, const char* argn[],
-                      const char* argv[], NPSavedData* saved) OVERRIDE;
+                      const char* argv[], NPSavedData* saved) override;
 };
 
 }  // namespace NPAPIClient
diff --git a/content/test/plugin/plugin_request_read_test.h b/content/test/plugin/plugin_request_read_test.h
index 67c8a70..e0a0836 100644
--- a/content/test/plugin/plugin_request_read_test.h
+++ b/content/test/plugin/plugin_request_read_test.h
@@ -24,14 +24,14 @@ class PluginRequestReadTest : public PluginTest {
   // NPAPI Functions
   //
   virtual NPError New(uint16 mode, int16 argc, const char* argn[],
-                      const char* argv[], NPSavedData* saved) OVERRIDE;
-  virtual NPError SetWindow(NPWindow* window) OVERRIDE;
+                      const char* argv[], NPSavedData* saved) override;
+  virtual NPError SetWindow(NPWindow* window) override;
   virtual NPError NewStream(NPMIMEType type, NPStream* stream,
-                            NPBool seekable, uint16* stream_type) OVERRIDE;
-  virtual NPError DestroyStream(NPStream *stream, NPError reason) OVERRIDE;
-  virtual int32 WriteReady(NPStream* stream) OVERRIDE;
+                            NPBool seekable, uint16* stream_type) override;
+  virtual NPError DestroyStream(NPStream *stream, NPError reason) override;
+  virtual int32 WriteReady(NPStream* stream) override;
   virtual int32 Write(NPStream* stream, int32 offset, int32 len,
-                      void* buffer) OVERRIDE;
+                      void* buffer) override;
 
  private:
   // Tracks ranges, which we requested, but for which we did not get response.
diff --git a/content/test/plugin/plugin_schedule_timer_test.h b/content/test/plugin/plugin_schedule_timer_test.h
index e13891a..23fa239 100644
--- a/content/test/plugin/plugin_schedule_timer_test.h
+++ b/content/test/plugin/plugin_schedule_timer_test.h
@@ -18,7 +18,7 @@ class ScheduleTimerTest : public PluginTest {
   ScheduleTimerTest(NPP id, NPNetscapeFuncs *host_functions);
 
   virtual NPError New(uint16 mode, int16 argc, const char* argn[],
-                      const char* argv[], NPSavedData* saved) OVERRIDE;
+                      const char* argv[], NPSavedData* saved) override;
 
   void OnTimer(uint32 timer_id);
 
diff --git a/content/test/plugin/plugin_setup_test.h b/content/test/plugin/plugin_setup_test.h
index b00554e..9611ecc 100644
--- a/content/test/plugin/plugin_setup_test.h
+++ b/content/test/plugin/plugin_setup_test.h
@@ -16,7 +16,7 @@ class PluginSetupTest : public PluginTest {
   PluginSetupTest(NPP id, NPNetscapeFuncs *host_functions);
 
   // NPAPI SetWindow handler.
-  virtual NPError SetWindow(NPWindow* pNPWindow) OVERRIDE;
+  virtual NPError SetWindow(NPWindow* pNPWindow) override;
 };
 
 }  // namespace NPAPIClient
diff --git a/content/test/plugin/plugin_thread_async_call_test.h b/content/test/plugin/plugin_thread_async_call_test.h
index ea8ea75b..2840e32 100644
--- a/content/test/plugin/plugin_thread_async_call_test.h
+++ b/content/test/plugin/plugin_thread_async_call_test.h
@@ -21,9 +21,9 @@ class PluginThreadAsyncCallTest : public PluginTest {
   virtual ~PluginThreadAsyncCallTest();
 
   virtual NPError New(uint16 mode, int16 argc, const char* argn[],
-                      const char* argv[], NPSavedData* saved) OVERRIDE;
+                      const char* argv[], NPSavedData* saved) override;
 
-  virtual NPError Destroy() OVERRIDE;
+  virtual NPError Destroy() override;
 
   void AsyncCall();
   void OnCallSucceeded();
diff --git a/content/test/plugin/plugin_window_size_test.h b/content/test/plugin/plugin_window_size_test.h
index 6435a6f..ea098de 100644
--- a/content/test/plugin/plugin_window_size_test.h
+++ b/content/test/plugin/plugin_window_size_test.h
@@ -17,7 +17,7 @@ class PluginWindowSizeTest : public PluginTest {
   // Constructor.
   PluginWindowSizeTest(NPP id, NPNetscapeFuncs *host_functions);
   // NPAPI SetWindow handler
-  virtual NPError SetWindow(NPWindow* pNPWindow) OVERRIDE;
+  virtual NPError SetWindow(NPWindow* pNPWindow) override;
 };
 
 }  // namespace NPAPIClient
diff --git a/content/test/plugin/plugin_windowless_test.h b/content/test/plugin/plugin_windowless_test.h
index 6a5ea8b7..53848ff 100644
--- a/content/test/plugin/plugin_windowless_test.h
+++ b/content/test/plugin/plugin_windowless_test.h
@@ -18,12 +18,12 @@ class WindowlessPluginTest : public PluginTest {
   WindowlessPluginTest(NPP id, NPNetscapeFuncs *host_functions);
 
   // These tests run in windowless plugin mode.
-  virtual bool IsWindowless() const OVERRIDE;
+  virtual bool IsWindowless() const override;
 
   // NPAPI HandleEvent handler
   virtual NPError New(uint16 mode, int16 argc, const char* argn[],
-                      const char* argv[], NPSavedData* saved) OVERRIDE;
-  virtual int16 HandleEvent(void* event) OVERRIDE;
+                      const char* argv[], NPSavedData* saved) override;
+  virtual int16 HandleEvent(void* event) override;
 
  protected:
   NPError ExecuteScript(NPNetscapeFuncs* browser, NPP id,
diff --git a/content/test/ppapi/ppapi_test.h b/content/test/ppapi/ppapi_test.h
index 345ad21..a1a3597 100644
--- a/content/test/ppapi/ppapi_test.h
+++ b/content/test/ppapi/ppapi_test.h
@@ -28,8 +28,8 @@ class PPAPITestMessageHandler : public content::TestMessageHandler {
  public:
   PPAPITestMessageHandler();
 
-  virtual MessageResponse HandleMessage(const std::string& json) OVERRIDE;
-  virtual void Reset() OVERRIDE;
+  virtual MessageResponse HandleMessage(const std::string& json) override;
+  virtual void Reset() override;
 
   const std::string& message() const {
     return message_;
@@ -46,7 +46,7 @@ class PPAPITestBase : public ContentBrowserTest {
   PPAPITestBase();
 
   // ContentBrowserTest overrides.
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
+  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
 
   virtual std::string BuildQuery(const std::string& base,
                                  const std::string& test_case) = 0;
@@ -71,10 +71,10 @@ class PPAPITest : public PPAPITestBase {
  public:
   PPAPITest();
 
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
+  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
 
   virtual std::string BuildQuery(const std::string& base,
-                                 const std::string& test_case) OVERRIDE;
+                                 const std::string& test_case) override;
  protected:
   bool in_process_;  // Controls the --ppapi-in-process switch.
 };
@@ -85,8 +85,8 @@ class OutOfProcessPPAPITest : public PPAPITest {
  public:
   OutOfProcessPPAPITest();
 
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 };
 
 }  // namespace
diff --git a/content/test/test_blink_web_unit_test_support.h b/content/test/test_blink_web_unit_test_support.h
index cea6cf9..9c2d092 100644
--- a/content/test/test_blink_web_unit_test_support.h
+++ b/content/test/test_blink_web_unit_test_support.h
@@ -41,7 +41,7 @@ class TestBlinkWebUnitTestSupport : public blink::WebUnitTestSupport,
   virtual blink::WebMimeRegistry* mimeRegistry();
 
   virtual blink::WebURLLoader* createURLLoader();
-  virtual blink::WebString userAgent() OVERRIDE;
+  virtual blink::WebString userAgent() override;
   virtual blink::WebData loadResource(const char* name);
   virtual blink::WebString queryLocalizedString(
       blink::WebLocalizedString::Name name);
@@ -72,7 +72,7 @@ class TestBlinkWebUnitTestSupport : public blink::WebUnitTestSupport,
   virtual blink::WebGestureCurve* createFlingAnimationCurve(
       blink::WebGestureDevice device_source,
       const blink::WebFloatPoint& velocity,
-      const blink::WebSize& cumulative_scroll) OVERRIDE;
+      const blink::WebSize& cumulative_scroll) override;
 
   virtual blink::WebUnitTestSupport* unitTestSupport();
 
diff --git a/content/test/test_content_browser_client.h b/content/test/test_content_browser_client.h
index b4ff3f9..2e46b11 100644
--- a/content/test/test_content_browser_client.h
+++ b/content/test/test_content_browser_client.h
@@ -19,7 +19,7 @@ class TestContentBrowserClient : public ContentBrowserClient {
  public:
   TestContentBrowserClient();
   virtual ~TestContentBrowserClient();
-  virtual base::FilePath GetDefaultDownloadDirectory() OVERRIDE;
+  virtual base::FilePath GetDefaultDownloadDirectory() override;
 
  private:
   // Temporary directory for GetDefaultDownloadDirectory.
diff --git a/content/test/test_content_client.h b/content/test/test_content_client.h
index 6643192..9ae7d3b 100644
--- a/content/test/test_content_client.h
+++ b/content/test/test_content_client.h
@@ -20,10 +20,10 @@ class TestContentClient : public ContentClient {
   virtual ~TestContentClient();
 
   // ContentClient:
-  virtual std::string GetUserAgent() const OVERRIDE;
+  virtual std::string GetUserAgent() const override;
   virtual base::StringPiece GetDataResource(
       int resource_id,
-      ui::ScaleFactor scale_factor) const OVERRIDE;
+      ui::ScaleFactor scale_factor) const override;
 
  private:
   ui::DataPack data_pack_;
diff --git a/content/test/test_frame_navigation_observer.h b/content/test/test_frame_navigation_observer.h
index 386c4db..5d37e69 100644
--- a/content/test/test_frame_navigation_observer.h
+++ b/content/test/test_frame_navigation_observer.h
@@ -44,10 +44,10 @@ class TestFrameNavigationObserver : public WebContentsObserver {
       RenderFrameHost* render_frame_host,
       const GURL& validated_url,
       bool is_error_page,
-      bool is_iframe_srcdoc) OVERRIDE;
+      bool is_iframe_srcdoc) override;
   virtual void DidNavigateAnyFrame(
       const LoadCommittedDetails& details,
-      const FrameNavigateParams& params) OVERRIDE;
+      const FrameNavigateParams& params) override;
 
   // The id of the FrameTreeNode in which navigations are peformed.
   int frame_tree_node_id_;
diff --git a/content/test/test_media_stream_renderer_factory.h b/content/test/test_media_stream_renderer_factory.h
index cf0aa7e..042c902 100644
--- a/content/test/test_media_stream_renderer_factory.h
+++ b/content/test/test_media_stream_renderer_factory.h
@@ -22,12 +22,12 @@ class TestMediaStreamRendererFactory : public MediaStreamRendererFactory {
   virtual scoped_refptr<VideoFrameProvider> GetVideoFrameProvider(
       const GURL& url,
       const base::Closure& error_cb,
-      const VideoFrameProvider::RepaintCB& repaint_cb) OVERRIDE;
+      const VideoFrameProvider::RepaintCB& repaint_cb) override;
 
   virtual scoped_refptr<MediaStreamAudioRenderer> GetAudioRenderer(
       const GURL& url,
       int render_view_id,
-      int render_frame_id) OVERRIDE;
+      int render_frame_id) override;
 };
 
 }  // namespace content
diff --git a/content/test/test_render_frame_host.h b/content/test/test_render_frame_host.h
index 579d10f..a985a0f 100644
--- a/content/test/test_render_frame_host.h
+++ b/content/test/test_render_frame_host.h
@@ -24,7 +24,7 @@ class TestRenderFrameHostCreationObserver : public WebContentsObserver {
   virtual ~TestRenderFrameHostCreationObserver();
 
   // WebContentsObserver implementation.
-  virtual void RenderFrameCreated(RenderFrameHost* render_frame_host) OVERRIDE;
+  virtual void RenderFrameCreated(RenderFrameHost* render_frame_host) override;
 
   RenderFrameHost* last_created_frame() const { return last_created_frame_; }
 
@@ -44,17 +44,17 @@ class TestRenderFrameHost : public RenderFrameHostImpl,
   virtual ~TestRenderFrameHost();
 
   // RenderFrameHostImpl overrides (same values, but in Test* types)
-  virtual TestRenderViewHost* GetRenderViewHost() OVERRIDE;
+  virtual TestRenderViewHost* GetRenderViewHost() override;
 
   // RenderFrameHostTester implementation.
   virtual TestRenderFrameHost* AppendChild(
-      const std::string& frame_name) OVERRIDE;
+      const std::string& frame_name) override;
   virtual void SendNavigateWithTransition(
       int page_id,
       const GURL& url,
-      ui::PageTransition transition) OVERRIDE;
-  virtual void SendBeforeUnloadACK(bool proceed) OVERRIDE;
-  virtual void SimulateSwapOutACK() OVERRIDE;
+      ui::PageTransition transition) override;
+  virtual void SendBeforeUnloadACK(bool proceed) override;
+  virtual void SimulateSwapOutACK() override;
 
   void SendNavigate(int page_id, const GURL& url);
   void SendFailedNavigate(int page_id, const GURL& url);
diff --git a/content/test/test_render_frame_host_factory.h b/content/test/test_render_frame_host_factory.h
index 6b3e71c..620e9c1 100644
--- a/content/test/test_render_frame_host_factory.h
+++ b/content/test/test_render_frame_host_factory.h
@@ -30,7 +30,7 @@ class TestRenderFrameHostFactory : public RenderFrameHostFactory {
       FrameTree* frame_tree,
       FrameTreeNode* frame_tree_node,
       int routing_id,
-      bool is_swapped_out) OVERRIDE;
+      bool is_swapped_out) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestRenderFrameHostFactory);
diff --git a/content/test/test_render_view_host.h b/content/test/test_render_view_host.h
index 14ec879..d9438de 100644
--- a/content/test/test_render_view_host.h
+++ b/content/test/test_render_view_host.h
@@ -56,91 +56,91 @@ class TestRenderWidgetHostView : public RenderWidgetHostViewBase {
   virtual ~TestRenderWidgetHostView();
 
   // RenderWidgetHostView implementation.
-  virtual void InitAsChild(gfx::NativeView parent_view) OVERRIDE {}
-  virtual RenderWidgetHost* GetRenderWidgetHost() const OVERRIDE;
-  virtual void SetSize(const gfx::Size& size) OVERRIDE {}
-  virtual void SetBounds(const gfx::Rect& rect) OVERRIDE {}
-  virtual gfx::Vector2dF GetLastScrollOffset() const OVERRIDE;
-  virtual gfx::NativeView GetNativeView() const OVERRIDE;
-  virtual gfx::NativeViewId GetNativeViewId() const OVERRIDE;
-  virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE;
-  virtual ui::TextInputClient* GetTextInputClient() OVERRIDE;
-  virtual bool HasFocus() const OVERRIDE;
-  virtual bool IsSurfaceAvailableForCopy() const OVERRIDE;
-  virtual void Show() OVERRIDE;
-  virtual void Hide() OVERRIDE;
-  virtual bool IsShowing() OVERRIDE;
-  virtual gfx::Rect GetViewBounds() const OVERRIDE;
+  virtual void InitAsChild(gfx::NativeView parent_view) override {}
+  virtual RenderWidgetHost* GetRenderWidgetHost() const override;
+  virtual void SetSize(const gfx::Size& size) override {}
+  virtual void SetBounds(const gfx::Rect& rect) override {}
+  virtual gfx::Vector2dF GetLastScrollOffset() const override;
+  virtual gfx::NativeView GetNativeView() const override;
+  virtual gfx::NativeViewId GetNativeViewId() const override;
+  virtual gfx::NativeViewAccessible GetNativeViewAccessible() override;
+  virtual ui::TextInputClient* GetTextInputClient() override;
+  virtual bool HasFocus() const override;
+  virtual bool IsSurfaceAvailableForCopy() const override;
+  virtual void Show() override;
+  virtual void Hide() override;
+  virtual bool IsShowing() override;
+  virtual gfx::Rect GetViewBounds() const override;
 #if defined(OS_MACOSX)
-  virtual void SetActive(bool active) OVERRIDE;
-  virtual void SetTakesFocusOnlyOnMouseDown(bool flag) OVERRIDE {}
-  virtual void SetWindowVisibility(bool visible) OVERRIDE {}
-  virtual void WindowFrameChanged() OVERRIDE {}
-  virtual void ShowDefinitionForSelection() OVERRIDE {}
-  virtual bool SupportsSpeech() const OVERRIDE;
-  virtual void SpeakSelection() OVERRIDE;
-  virtual bool IsSpeaking() const OVERRIDE;
-  virtual void StopSpeaking() OVERRIDE;
+  virtual void SetActive(bool active) override;
+  virtual void SetTakesFocusOnlyOnMouseDown(bool flag) override {}
+  virtual void SetWindowVisibility(bool visible) override {}
+  virtual void WindowFrameChanged() override {}
+  virtual void ShowDefinitionForSelection() override {}
+  virtual bool SupportsSpeech() const override;
+  virtual void SpeakSelection() override;
+  virtual bool IsSpeaking() const override;
+  virtual void StopSpeaking() override;
 #endif  // defined(OS_MACOSX)
   virtual void OnSwapCompositorFrame(
       uint32 output_surface_id,
-      scoped_ptr<cc::CompositorFrame> frame) OVERRIDE;
+      scoped_ptr<cc::CompositorFrame> frame) override;
 
   // RenderWidgetHostViewBase implementation.
   virtual void InitAsPopup(RenderWidgetHostView* parent_host_view,
-                           const gfx::Rect& pos) OVERRIDE {}
+                           const gfx::Rect& pos) override {}
   virtual void InitAsFullscreen(
-      RenderWidgetHostView* reference_host_view) OVERRIDE {}
-  virtual void WasShown() OVERRIDE {}
-  virtual void WasHidden() OVERRIDE {}
+      RenderWidgetHostView* reference_host_view) override {}
+  virtual void WasShown() override {}
+  virtual void WasHidden() override {}
   virtual void MovePluginWindows(
-      const std::vector<WebPluginGeometry>& moves) OVERRIDE {}
-  virtual void Focus() OVERRIDE {}
-  virtual void Blur() OVERRIDE {}
-  virtual void SetIsLoading(bool is_loading) OVERRIDE {}
-  virtual void UpdateCursor(const WebCursor& cursor) OVERRIDE {}
+      const std::vector<WebPluginGeometry>& moves) override {}
+  virtual void Focus() override {}
+  virtual void Blur() override {}
+  virtual void SetIsLoading(bool is_loading) override {}
+  virtual void UpdateCursor(const WebCursor& cursor) override {}
   virtual void TextInputStateChanged(
-      const ViewHostMsg_TextInputState_Params& params) OVERRIDE {}
-  virtual void ImeCancelComposition() OVERRIDE {}
+      const ViewHostMsg_TextInputState_Params& params) override {}
+  virtual void ImeCancelComposition() override {}
 #if defined(OS_MACOSX) || defined(USE_AURA)
   virtual void ImeCompositionRangeChanged(
       const gfx::Range& range,
-      const std::vector<gfx::Rect>& character_bounds) OVERRIDE {}
+      const std::vector<gfx::Rect>& character_bounds) override {}
 #endif
   virtual void RenderProcessGone(base::TerminationStatus status,
-                                 int error_code) OVERRIDE;
-  virtual void Destroy() OVERRIDE;
-  virtual void SetTooltipText(const base::string16& tooltip_text) OVERRIDE {}
+                                 int error_code) override;
+  virtual void Destroy() override;
+  virtual void SetTooltipText(const base::string16& tooltip_text) override {}
   virtual void SelectionBoundsChanged(
-      const ViewHostMsg_SelectionBounds_Params& params) OVERRIDE {}
+      const ViewHostMsg_SelectionBounds_Params& params) override {}
   virtual void CopyFromCompositingSurface(
       const gfx::Rect& src_subrect,
       const gfx::Size& dst_size,
       CopyFromCompositingSurfaceCallback& callback,
-      const SkColorType color_type) OVERRIDE;
+      const SkColorType color_type) override;
   virtual void CopyFromCompositingSurfaceToVideoFrame(
       const gfx::Rect& src_subrect,
       const scoped_refptr<media::VideoFrame>& target,
-      const base::Callback<void(bool)>& callback) OVERRIDE;
-  virtual bool CanCopyToVideoFrame() const OVERRIDE;
-  virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE;
+      const base::Callback<void(bool)>& callback) override;
+  virtual bool CanCopyToVideoFrame() const override;
+  virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) override;
 #if defined(OS_MACOSX)
   virtual bool PostProcessEventForPluginIme(
-      const NativeWebKeyboardEvent& event) OVERRIDE;
+      const NativeWebKeyboardEvent& event) override;
 #endif
 #if defined(OS_ANDROID)
-  virtual void LockCompositingSurface() OVERRIDE {}
-  virtual void UnlockCompositingSurface() OVERRIDE {}
+  virtual void LockCompositingSurface() override {}
+  virtual void UnlockCompositingSurface() override {}
 #endif
-  virtual void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE {}
-  virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE;
-  virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE;
-  virtual bool LockMouse() OVERRIDE;
-  virtual void UnlockMouse() OVERRIDE;
+  virtual void GetScreenInfo(blink::WebScreenInfo* results) override {}
+  virtual gfx::Rect GetBoundsInRootWindow() override;
+  virtual gfx::GLSurfaceHandle GetCompositingSurface() override;
+  virtual bool LockMouse() override;
+  virtual void UnlockMouse() override;
 #if defined(OS_WIN)
   virtual void SetParentNativeViewAccessible(
-      gfx::NativeViewAccessible accessible_parent) OVERRIDE;
-  virtual gfx::NativeViewId GetParentForWindowlessPlugin() const OVERRIDE;
+      gfx::NativeViewAccessible accessible_parent) override;
+  virtual gfx::NativeViewId GetParentForWindowlessPlugin() const override;
 #endif
 
   bool is_showing() const { return is_showing_; }
@@ -211,18 +211,18 @@ class TestRenderViewHost
   // RenderViewHostTester implementation.  Note that CreateRenderView
   // is not specified since it is synonymous with the one from
   // RenderViewHostImpl, see below.
-  virtual void SetContentsMimeType(const std::string& mime_type) OVERRIDE;
-  virtual void SimulateWasHidden() OVERRIDE;
-  virtual void SimulateWasShown() OVERRIDE;
+  virtual void SetContentsMimeType(const std::string& mime_type) override;
+  virtual void SimulateWasHidden() override;
+  virtual void SimulateWasShown() override;
 
   // NOTE: These methods are deprecated and the equivalents in
   // TestRenderFrameHost should be used.
-  virtual void SendNavigate(int page_id, const GURL& url) OVERRIDE;
-  virtual void SendFailedNavigate(int page_id, const GURL& url) OVERRIDE;
+  virtual void SendNavigate(int page_id, const GURL& url) override;
+  virtual void SendFailedNavigate(int page_id, const GURL& url) override;
   virtual void SendNavigateWithTransition(
       int page_id,
       const GURL& url,
-      ui::PageTransition transition) OVERRIDE;
+      ui::PageTransition transition) override;
 
   // Calls OnNavigate on the RenderViewHost with the given information,
   // including a custom original request URL.  Sets the rest of the
@@ -282,9 +282,9 @@ class TestRenderViewHost
                                 int opener_route_id,
                                 int proxy_route_id,
                                 int32 max_page_id,
-                                bool window_was_created_with_opener) OVERRIDE;
-  virtual bool IsRenderViewLive() const OVERRIDE;
-  virtual bool IsFullscreen() const OVERRIDE;
+                                bool window_was_created_with_opener) override;
+  virtual bool IsRenderViewLive() const override;
+  virtual bool IsFullscreen() const override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, FilterNavigate);
diff --git a/content/test/test_render_view_host_factory.h b/content/test/test_render_view_host_factory.h
index e93762f..6413781 100644
--- a/content/test/test_render_view_host_factory.h
+++ b/content/test/test_render_view_host_factory.h
@@ -33,7 +33,7 @@ class TestRenderViewHostFactory : public RenderViewHostFactory {
       RenderWidgetHostDelegate* widget_delegate,
       int routing_id,
       int main_frame_routing_id,
-      bool swapped_out) OVERRIDE;
+      bool swapped_out) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestRenderViewHostFactory);
diff --git a/content/test/test_video_frame_provider.h b/content/test/test_video_frame_provider.h
index a08a3a4..16b2008 100644
--- a/content/test/test_video_frame_provider.h
+++ b/content/test/test_video_frame_provider.h
@@ -29,10 +29,10 @@ class TestVideoFrameProvider : public VideoFrameProvider {
       const RepaintCB& repaint_cb);
 
   // VideoFrameProvider implementation.
-  virtual void Start() OVERRIDE;
-  virtual void Stop() OVERRIDE;
-  virtual void Play() OVERRIDE;
-  virtual void Pause() OVERRIDE;
+  virtual void Start() override;
+  virtual void Stop() override;
+  virtual void Play() override;
+  virtual void Pause() override;
 
  protected:
   virtual ~TestVideoFrameProvider();
diff --git a/content/test/test_web_contents.h b/content/test/test_web_contents.h
index 8771af1..5ddd706 100644
--- a/content/test/test_web_contents.h
+++ b/content/test/test_web_contents.h
@@ -30,26 +30,26 @@ class TestWebContents : public WebContentsImpl, public WebContentsTester {
                                  SiteInstance* instance);
 
   // WebContentsImpl overrides (returning the same values, but in Test* types)
-  virtual TestRenderFrameHost* GetMainFrame() OVERRIDE;
-  virtual TestRenderViewHost* GetRenderViewHost() const OVERRIDE;
+  virtual TestRenderFrameHost* GetMainFrame() override;
+  virtual TestRenderViewHost* GetRenderViewHost() const override;
 
   // WebContentsTester implementation.
-  virtual void CommitPendingNavigation() OVERRIDE;
-  virtual TestRenderFrameHost* GetPendingMainFrame() const OVERRIDE;
-  virtual void NavigateAndCommit(const GURL& url) OVERRIDE;
-  virtual void TestSetIsLoading(bool value) OVERRIDE;
-  virtual void ProceedWithCrossSiteNavigation() OVERRIDE;
+  virtual void CommitPendingNavigation() override;
+  virtual TestRenderFrameHost* GetPendingMainFrame() const override;
+  virtual void NavigateAndCommit(const GURL& url) override;
+  virtual void TestSetIsLoading(bool value) override;
+  virtual void ProceedWithCrossSiteNavigation() override;
   virtual void TestDidNavigate(RenderFrameHost* render_frame_host,
                                int page_id,
                                const GURL& url,
-                               ui::PageTransition transition) OVERRIDE;
+                               ui::PageTransition transition) override;
   virtual void TestDidNavigateWithReferrer(
       RenderFrameHost* render_frame_host,
       int page_id,
       const GURL& url,
       const Referrer& referrer,
-      ui::PageTransition transition) OVERRIDE;
-  virtual WebPreferences TestComputeWebkitPrefs() OVERRIDE;
+      ui::PageTransition transition) override;
+  virtual WebPreferences TestComputeWebkitPrefs() override;
 
   // State accessor.
   bool cross_navigation_pending() {
@@ -61,15 +61,15 @@ class TestWebContents : public WebContentsImpl, public WebContentsTester {
       RenderViewHost* render_view_host,
       int opener_route_id,
       int proxy_routing_id,
-      bool for_main_frame) OVERRIDE;
-  virtual void UpdateRenderViewSizeForRenderManager() OVERRIDE {}
+      bool for_main_frame) override;
+  virtual void UpdateRenderViewSizeForRenderManager() override {}
 
   // Returns a clone of this TestWebContents. The returned object is also a
   // TestWebContents. The caller owns the returned object.
-  virtual WebContents* Clone() OVERRIDE;
+  virtual WebContents* Clone() override;
 
   // Allow mocking of the RenderViewHostDelegateView.
-  virtual RenderViewHostDelegateView* GetDelegateView() OVERRIDE;
+  virtual RenderViewHostDelegateView* GetDelegateView() override;
   void set_delegate_view(RenderViewHostDelegateView* view) {
     delegate_view_override_ = view;
   }
@@ -91,7 +91,7 @@ class TestWebContents : public WebContentsImpl, public WebContentsTester {
   // to |ExpectSetHistoryLengthAndPrune()|.
   virtual void SetHistoryLengthAndPrune(const SiteInstance* site_instance,
                                         int history_length,
-                                        int32 min_page_id) OVERRIDE;
+                                        int32 min_page_id) override;
 
   void TestDidFinishLoad(const GURL& url);
   void TestDidFailLoadWithError(const GURL& url,
@@ -109,19 +109,19 @@ class TestWebContents : public WebContentsImpl, public WebContentsTester {
       int route_id,
       int main_frame_route_id,
       const ViewHostMsg_CreateWindow_Params& params,
-      SessionStorageNamespace* session_storage_namespace) OVERRIDE;
+      SessionStorageNamespace* session_storage_namespace) override;
   virtual void CreateNewWidget(int render_process_id,
                                int route_id,
-                               blink::WebPopupType popup_type) OVERRIDE;
+                               blink::WebPopupType popup_type) override;
   virtual void CreateNewFullscreenWidget(int render_process_id,
-                                         int route_id) OVERRIDE;
+                                         int route_id) override;
   virtual void ShowCreatedWindow(int route_id,
                                  WindowOpenDisposition disposition,
                                  const gfx::Rect& initial_pos,
-                                 bool user_gesture) OVERRIDE;
+                                 bool user_gesture) override;
   virtual void ShowCreatedWidget(int route_id,
-                                 const gfx::Rect& initial_pos) OVERRIDE;
-  virtual void ShowCreatedFullscreenWidget(int route_id) OVERRIDE;
+                                 const gfx::Rect& initial_pos) override;
+  virtual void ShowCreatedFullscreenWidget(int route_id) override;
 
 
   RenderViewHostDelegateView* delegate_view_override_;
diff --git a/content/test/web_gesture_curve_mock.h b/content/test/web_gesture_curve_mock.h
index e103c17..1dbaa8f 100644
--- a/content/test/web_gesture_curve_mock.h
+++ b/content/test/web_gesture_curve_mock.h
@@ -20,7 +20,7 @@ class WebGestureCurveMock : public blink::WebGestureCurve {
 
   // Returns false if curve has finished and can no longer be applied.
   virtual bool apply(double time,
-                     blink::WebGestureCurveTarget* target) OVERRIDE;
+                     blink::WebGestureCurveTarget* target) override;
 
  private:
   blink::WebFloatPoint velocity_;
diff --git a/content/test/web_layer_tree_view_impl_for_testing.h b/content/test/web_layer_tree_view_impl_for_testing.h
index 72761c8..7162917 100644
--- a/content/test/web_layer_tree_view_impl_for_testing.h
+++ b/content/test/web_layer_tree_view_impl_for_testing.h
@@ -57,35 +57,35 @@ class WebLayerTreeViewImplForTesting
   virtual void registerViewportLayers(
       const blink::WebLayer* pageScaleLayerLayer,
       const blink::WebLayer* innerViewportScrollLayer,
-      const blink::WebLayer* outerViewportScrollLayer) OVERRIDE;
-  virtual void clearViewportLayers() OVERRIDE;
+      const blink::WebLayer* outerViewportScrollLayer) override;
+  virtual void clearViewportLayers() override;
   virtual void registerSelection(
       const blink::WebSelectionBound& start,
-      const blink::WebSelectionBound& end) OVERRIDE;
-  virtual void clearSelection() OVERRIDE;
+      const blink::WebSelectionBound& end) override;
+  virtual void clearSelection() override;
 
   // cc::LayerTreeHostClient implementation.
-  virtual void WillBeginMainFrame(int frame_id) OVERRIDE {}
-  virtual void DidBeginMainFrame() OVERRIDE {}
-  virtual void BeginMainFrame(const cc::BeginFrameArgs& args) OVERRIDE {}
-  virtual void Layout() OVERRIDE;
+  virtual void WillBeginMainFrame(int frame_id) override {}
+  virtual void DidBeginMainFrame() override {}
+  virtual void BeginMainFrame(const cc::BeginFrameArgs& args) override {}
+  virtual void Layout() override;
   virtual void ApplyViewportDeltas(const gfx::Vector2d& inner_delta,
                                    const gfx::Vector2d& outer_delta,
                                    float page_scale,
-                                   float top_controls_delta) OVERRIDE;
+                                   float top_controls_delta) override;
   virtual void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta,
                                    float page_scale,
-                                   float top_controls_delta) OVERRIDE;
-  virtual void RequestNewOutputSurface(bool fallback) OVERRIDE;
-  virtual void DidInitializeOutputSurface() OVERRIDE {}
-  virtual void WillCommit() OVERRIDE {}
-  virtual void DidCommit() OVERRIDE {}
-  virtual void DidCommitAndDrawFrame() OVERRIDE {}
-  virtual void DidCompleteSwapBuffers() OVERRIDE {}
+                                   float top_controls_delta) override;
+  virtual void RequestNewOutputSurface(bool fallback) override;
+  virtual void DidInitializeOutputSurface() override {}
+  virtual void WillCommit() override {}
+  virtual void DidCommit() override {}
+  virtual void DidCommitAndDrawFrame() override {}
+  virtual void DidCompleteSwapBuffers() override {}
 
   // cc::LayerTreeHostSingleThreadClient implementation.
-  virtual void DidPostSwapBuffers() OVERRIDE {}
-  virtual void DidAbortSwapBuffers() OVERRIDE {}
+  virtual void DidPostSwapBuffers() override {}
+  virtual void DidAbortSwapBuffers() override {}
 
  private:
   scoped_ptr<cc::LayerTreeHost> layer_tree_host_;
diff --git a/content/test/webrtc_content_browsertest_base.h b/content/test/webrtc_content_browsertest_base.h
index 94b7b6a..804be5a 100644
--- a/content/test/webrtc_content_browsertest_base.h
+++ b/content/test/webrtc_content_browsertest_base.h
@@ -13,9 +13,9 @@ namespace content {
 // Contains stuff WebRTC browsertests have in common.
 class WebRtcContentBrowserTest: public ContentBrowserTest {
  public:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
  protected:
   // Executes |javascript|. The script is required to use