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}
280723148 · Oct 6, 2014 · 71fc3ad · 71fc3ad
1 parent 449f39a
commit 71fc3ad
Show file tree

Hide file tree

Showing 45 changed files with 215 additions and 215 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.