Standardize usage of virtual/override/final in content/
This patch was automatically generated by applying clang fixit hints
generated by the plugin to the source tree.
BUG=417463
[email protected]
Review URL: https://codereview.chromium.org/671663002
Cr-Commit-Position: refs/heads/master@{#300461}
diff --git a/content/test/appcache_test_helper.h b/content/test/appcache_test_helper.h
index 94747ee..5f5221f 100644
--- a/content/test/appcache_test_helper.h
+++ b/content/test/appcache_test_helper.h
@@ -20,18 +20,17 @@
class AppCacheTestHelper : public AppCacheStorage::Delegate {
public:
AppCacheTestHelper();
- virtual ~AppCacheTestHelper();
+ ~AppCacheTestHelper() override;
void AddGroupAndCache(AppCacheServiceImpl* appcache_service,
const GURL& manifest_url);
void GetOriginsWithCaches(AppCacheServiceImpl* appcache_service,
std::set<GURL>* origins);
private:
- virtual void OnGroupAndNewestCacheStored(
- AppCacheGroup* group,
- AppCache* newest_cache,
- bool success,
- bool would_exceed_quota) override;
+ void OnGroupAndNewestCacheStored(AppCacheGroup* group,
+ AppCache* newest_cache,
+ bool success,
+ 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 2bde9ccf..b8131fe 100644
--- a/content/test/browser_test_utils_browsertest.cc
+++ b/content/test/browser_test_utils_browsertest.cc
@@ -16,16 +16,16 @@
public:
explicit NavigationObserver(WebContents* web_contents)
: WebContentsObserver(web_contents) {}
- virtual ~NavigationObserver() {}
+ ~NavigationObserver() override {}
- virtual void DidCommitProvisionalLoadForFrame(
+ void DidCommitProvisionalLoadForFrame(
RenderFrameHost* render_frame_host,
const GURL& url,
ui::PageTransition transition_type) override {
navigation_url_ = url;
}
- virtual void DidGetRedirectForResourceRequest(
+ void DidGetRedirectForResourceRequest(
RenderViewHost* render_view_host,
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 a10b633..42a89013 100644
--- a/content/test/content_browser_test_test.cc
+++ b/content/test/content_browser_test_test.cc
@@ -21,7 +21,7 @@
class ContentBrowserTestSanityTest : public ContentBrowserTest {
public:
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ 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 6990fe9..e19db37 100644
--- a/content/test/content_test_launcher.cc
+++ b/content/test/content_test_launcher.cc
@@ -45,12 +45,10 @@
ContentBrowserTestSuite(int argc, char** argv)
: ContentTestSuiteBase(argc, argv) {
}
- virtual ~ContentBrowserTestSuite() {
- }
+ ~ContentBrowserTestSuite() override {}
protected:
- virtual void Initialize() override {
-
+ void Initialize() override {
#if defined(OS_ANDROID)
base::i18n::AllowMultipleInitializeCallsForTesting();
base::i18n::InitializeICU();
@@ -91,14 +89,15 @@
class ContentTestLauncherDelegate : public TestLauncherDelegate {
public:
ContentTestLauncherDelegate() {}
- virtual ~ContentTestLauncherDelegate() {}
+ ~ContentTestLauncherDelegate() override {}
- virtual int RunTestSuite(int argc, char** argv) override {
+ 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 {
+ bool AdjustChildProcessCommandLine(
+ 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 +106,7 @@
}
protected:
- virtual ContentMainDelegate* CreateContentMainDelegate() override {
+ ContentMainDelegate* CreateContentMainDelegate() override {
return new ShellMainDelegate();
}
diff --git a/content/test/content_test_suite.h b/content/test/content_test_suite.h
index 3203fef..6991b99 100644
--- a/content/test/content_test_suite.h
+++ b/content/test/content_test_suite.h
@@ -17,10 +17,10 @@
class ContentTestSuite : public ContentTestSuiteBase {
public:
ContentTestSuite(int argc, char** argv);
- virtual ~ContentTestSuite();
+ ~ContentTestSuite() override;
protected:
- virtual void Initialize() override;
+ void Initialize() override;
private:
#if defined(OS_WIN)
diff --git a/content/test/mock_google_streaming_server.h b/content/test/mock_google_streaming_server.h
index b8064c1..43c0986a 100644
--- a/content/test/mock_google_streaming_server.h
+++ b/content/test/mock_google_streaming_server.h
@@ -32,9 +32,9 @@
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;
+ void OnRequestStart(int fetcher_id) override;
+ void OnChunkUpload(int fetcher_id) override;
+ 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 6068dba..2dc20ee 100644
--- a/content/test/mock_render_process.h
+++ b/content/test/mock_render_process.h
@@ -13,11 +13,11 @@
class MockRenderProcess : public RenderProcess {
public:
MockRenderProcess();
- virtual ~MockRenderProcess();
+ ~MockRenderProcess() override;
// RenderProcess implementation.
- virtual void AddBindings(int bindings) override;
- virtual int GetEnabledBindings() const override;
+ void AddBindings(int bindings) override;
+ 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 973180dcf..88e348c 100644
--- a/content/test/net/url_request_abort_on_end_job.h
+++ b/content/test/net/url_request_abort_on_end_job.h
@@ -26,17 +26,15 @@
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 bool ReadRawData(net::IOBuffer* buf,
- int buf_size,
- int* bytes_read) override;
+ void Start() override;
+ bool GetMimeType(std::string* mime_type) const override;
+ void GetResponseInfo(net::HttpResponseInfo* info) override;
+ bool ReadRawData(net::IOBuffer* buf, int buf_size, int* bytes_read) override;
static void AddUrlHandler();
private:
- virtual ~URLRequestAbortOnEndJob();
+ ~URLRequestAbortOnEndJob() override;
void GetResponseInfoConst(net::HttpResponseInfo* info) const;
void StartAsync();
diff --git a/content/test/net/url_request_slow_download_job.h b/content/test/net/url_request_slow_download_job.h
index 78faa384..08b6dc0 100644
--- a/content/test/net/url_request_slow_download_job.h
+++ b/content/test/net/url_request_slow_download_job.h
@@ -35,12 +35,10 @@
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 bool ReadRawData(net::IOBuffer* buf,
- int buf_size,
- int *bytes_read) override;
+ void Start() override;
+ bool GetMimeType(std::string* mime_type) const override;
+ void GetResponseInfo(net::HttpResponseInfo* info) override;
+ bool ReadRawData(net::IOBuffer* buf, int buf_size, int* bytes_read) override;
static net::URLRequestJob* Factory(net::URLRequest* request,
net::NetworkDelegate* network_delegate,
@@ -56,7 +54,7 @@
private:
URLRequestSlowDownloadJob(net::URLRequest* request,
net::NetworkDelegate* network_delegate);
- virtual ~URLRequestSlowDownloadJob();
+ ~URLRequestSlowDownloadJob() override;
// Enum indicating where we are in the read after a call to
// FillBufferHelper.
diff --git a/content/test/plugin/plugin_arguments_test.h b/content/test/plugin/plugin_arguments_test.h
index 87ab14d..95b04c7 100644
--- a/content/test/plugin/plugin_arguments_test.h
+++ b/content/test/plugin/plugin_arguments_test.h
@@ -32,11 +32,14 @@
PluginArgumentsTest(NPP id, NPNetscapeFuncs *host_functions);
// 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;
+ NPError New(uint16 mode,
+ int16 argc,
+ const char* argn[],
+ const char* argv[],
+ NPSavedData* saved) override;
// NPAPI SetWindow handler.
- virtual NPError SetWindow(NPWindow* pNPWindow) override;
+ 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 3538360..f2e856f 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 @@
DeletePluginInDeallocateTest(NPP id, NPNetscapeFuncs* host_functions);
// NPAPI handlers.
- virtual NPError SetWindow(NPWindow* pNPWindow) override;
- virtual NPError Destroy() override;
+ NPError SetWindow(NPWindow* pNPWindow) override;
+ 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 4a32298..2613a72 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,12 @@
//
// NPAPI functions
//
- virtual NPError SetWindow(NPWindow* pNPWindow) override;
- virtual NPError NewStream(NPMIMEType type, NPStream* stream,
- NPBool seekable, uint16* stype) override;
+ NPError SetWindow(NPWindow* pNPWindow) override;
+ NPError NewStream(NPMIMEType type,
+ NPStream* stream,
+ 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 2c0de0b0f..750fc40 100644
--- a/content/test/plugin/plugin_execute_stream_javascript.h
+++ b/content/test/plugin/plugin_execute_stream_javascript.h
@@ -19,12 +19,13 @@
//
// NPAPI functions
//
- virtual NPError NewStream(NPMIMEType type, NPStream* stream,
- 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;
+ NPError NewStream(NPMIMEType type,
+ NPStream* stream,
+ NPBool seekable,
+ uint16* stype) override;
+ int32 WriteReady(NPStream* stream) override;
+ int32 Write(NPStream* stream, int32 offset, int32 len, void* buffer) override;
+ 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 450cfd1..3db58f49 100644
--- a/content/test/plugin/plugin_get_javascript_url2_test.h
+++ b/content/test/plugin/plugin_get_javascript_url2_test.h
@@ -20,16 +20,15 @@
//
// NPAPI functions
//
- virtual NPError SetWindow(NPWindow* pNPWindow) override;
- virtual NPError NewStream(NPMIMEType type, NPStream* stream,
- 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 URLNotify(const char* url,
- NPReason reason,
- void* data) override;
+ NPError SetWindow(NPWindow* pNPWindow) override;
+ NPError NewStream(NPMIMEType type,
+ NPStream* stream,
+ NPBool seekable,
+ uint16* stype) override;
+ int32 WriteReady(NPStream* stream) override;
+ int32 Write(NPStream* stream, int32 offset, int32 len, void* buffer) override;
+ NPError DestroyStream(NPStream* stream, NPError reason) override;
+ void URLNotify(const char* url, NPReason reason, 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 a7f1043..e45b03a0 100644
--- a/content/test/plugin/plugin_get_javascript_url_test.h
+++ b/content/test/plugin/plugin_get_javascript_url_test.h
@@ -19,16 +19,15 @@
//
// NPAPI functions
//
- virtual NPError SetWindow(NPWindow* pNPWindow) override;
- virtual NPError NewStream(NPMIMEType type, NPStream* stream,
- 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 URLNotify(const char* url,
- NPReason reason,
- void* data) override;
+ NPError SetWindow(NPWindow* pNPWindow) override;
+ NPError NewStream(NPMIMEType type,
+ NPStream* stream,
+ NPBool seekable,
+ uint16* stype) override;
+ int32 WriteReady(NPStream* stream) override;
+ int32 Write(NPStream* stream, int32 offset, int32 len, void* buffer) override;
+ NPError DestroyStream(NPStream* stream, NPError reason) override;
+ void URLNotify(const char* url, NPReason reason, 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 48a7e74..6d35d5f 100644
--- a/content/test/plugin/plugin_geturl_test.h
+++ b/content/test/plugin/plugin_geturl_test.h
@@ -22,25 +22,29 @@
public:
// Constructor.
PluginGetURLTest(NPP id, NPNetscapeFuncs *host_functions);
- virtual ~PluginGetURLTest();
+ ~PluginGetURLTest() override;
//
// NPAPI functions
//
- virtual NPError New(uint16 mode, int16 argc, const char* argn[],
- 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;
- 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;
- virtual void URLNotify(const char* url, NPReason reason,
- void* data) override;
- virtual void URLRedirectNotify(const char* url, int32_t status,
- void* notify_data) override;
+ NPError New(uint16 mode,
+ int16 argc,
+ const char* argn[],
+ const char* argv[],
+ NPSavedData* saved) override;
+ NPError SetWindow(NPWindow* pNPWindow) override;
+ NPError NewStream(NPMIMEType type,
+ NPStream* stream,
+ NPBool seekable,
+ uint16* stype) override;
+ int32 WriteReady(NPStream* stream) override;
+ int32 Write(NPStream* stream, int32 offset, int32 len, void* buffer) override;
+ NPError DestroyStream(NPStream* stream, NPError reason) override;
+ void StreamAsFile(NPStream* stream, const char* fname) override;
+ void URLNotify(const char* url, NPReason reason, void* data) override;
+ void URLRedirectNotify(const char* url,
+ int32_t status,
+ 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 f6a4a875..5a40163 100644
--- a/content/test/plugin/plugin_javascript_open_popup.h
+++ b/content/test/plugin/plugin_javascript_open_popup.h
@@ -19,7 +19,7 @@
ExecuteJavascriptOpenPopupWithPluginTest(
NPP id, NPNetscapeFuncs *host_functions);
// NPAPI SetWindow handler.
- virtual NPError SetWindow(NPWindow* window) override;
+ NPError SetWindow(NPWindow* window) override;
private:
bool popup_window_test_started_;
@@ -32,7 +32,7 @@
ExecuteJavascriptPopupWindowTargetPluginTest(
NPP id, NPNetscapeFuncs *host_functions);
// NPAPI SetWindow handler.
- virtual NPError SetWindow(NPWindow* window) override;
+ 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 b130399d..640a4da 100644
--- a/content/test/plugin/plugin_new_fails_test.h
+++ b/content/test/plugin/plugin_new_fails_test.h
@@ -13,8 +13,11 @@
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;
+ NPError New(uint16 mode,
+ int16 argc,
+ const char* argn[],
+ 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 d1bcda2..fa749a5 100644
--- a/content/test/plugin/plugin_npobject_identity_test.h
+++ b/content/test/plugin/plugin_npobject_identity_test.h
@@ -19,7 +19,7 @@
NPObjectIdentityTest(NPP id, NPNetscapeFuncs *host_functions);
// NPAPI SetWindow handler.
- virtual NPError SetWindow(NPWindow* pNPWindow) override;
+ 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 09c2d065..f1abed22 100644
--- a/content/test/plugin/plugin_npobject_lifetime_test.h
+++ b/content/test/plugin/plugin_npobject_lifetime_test.h
@@ -21,11 +21,9 @@
NPObjectLifetimeTest(NPP id, NPNetscapeFuncs *host_functions);
// NPAPI SetWindow handler.
- virtual NPError SetWindow(NPWindow* pNPWindow) override;
+ NPError SetWindow(NPWindow* pNPWindow) override;
- virtual void URLNotify(const char* url,
- NPReason reason,
- void* data) override;
+ void URLNotify(const char* url, NPReason reason, void* data) override;
protected:
NPObject* other_plugin_instance_object_;
@@ -44,10 +42,11 @@
public:
// Constructor.
NPObjectLifetimeTestInstance2(NPP id, NPNetscapeFuncs *host_functions);
- virtual ~NPObjectLifetimeTestInstance2();
+ ~NPObjectLifetimeTestInstance2() override;
// NPAPI SetWindow handler.
- virtual NPError SetWindow(NPWindow* pNPWindow) override;
+ NPError SetWindow(NPWindow* pNPWindow) override;
+
protected:
static NPObject* plugin_instance_object_;
friend class NPObjectLifetimeTest;
@@ -61,10 +60,10 @@
public:
// Constructor.
NPObjectDeletePluginInNPN_Evaluate(NPP id, NPNetscapeFuncs *host_functions);
- virtual ~NPObjectDeletePluginInNPN_Evaluate();
+ ~NPObjectDeletePluginInNPN_Evaluate() override;
// NPAPI SetWindow handler.
- virtual NPError SetWindow(NPWindow* pNPWindow) override;
+ 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 a35a34c..5ffc832d 100644
--- a/content/test/plugin/plugin_npobject_proxy_test.h
+++ b/content/test/plugin/plugin_npobject_proxy_test.h
@@ -20,7 +20,7 @@
NPObjectProxyTest(NPP id, NPNetscapeFuncs *host_functions);
// NPAPI SetWindow handler.
- virtual NPError SetWindow(NPWindow* pNPWindow) override;
+ 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 6a7fdb2..c04b5e1 100644
--- a/content/test/plugin/plugin_private_test.h
+++ b/content/test/plugin/plugin_private_test.h
@@ -17,8 +17,11 @@
PrivateTest(NPP id, NPNetscapeFuncs *host_functions);
// 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;
+ NPError New(uint16 mode,
+ int16 argc,
+ const char* argn[],
+ 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 e0a0836..cbb0f90 100644
--- a/content/test/plugin/plugin_request_read_test.h
+++ b/content/test/plugin/plugin_request_read_test.h
@@ -18,20 +18,24 @@
class PluginRequestReadTest : public PluginTest {
public:
PluginRequestReadTest(NPP id, NPNetscapeFuncs* host_functions);
- virtual ~PluginRequestReadTest();
+ ~PluginRequestReadTest() override;
//
// NPAPI Functions
//
- virtual NPError New(uint16 mode, int16 argc, const char* argn[],
- 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;
- virtual int32 Write(NPStream* stream, int32 offset, int32 len,
- void* buffer) override;
+ NPError New(uint16 mode,
+ int16 argc,
+ const char* argn[],
+ const char* argv[],
+ NPSavedData* saved) override;
+ NPError SetWindow(NPWindow* window) override;
+ NPError NewStream(NPMIMEType type,
+ NPStream* stream,
+ NPBool seekable,
+ uint16* stream_type) override;
+ NPError DestroyStream(NPStream* stream, NPError reason) override;
+ int32 WriteReady(NPStream* stream) override;
+ int32 Write(NPStream* stream, int32 offset, int32 len, 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 23fa2396..161c81a 100644
--- a/content/test/plugin/plugin_schedule_timer_test.h
+++ b/content/test/plugin/plugin_schedule_timer_test.h
@@ -17,8 +17,11 @@
public:
ScheduleTimerTest(NPP id, NPNetscapeFuncs *host_functions);
- virtual NPError New(uint16 mode, int16 argc, const char* argn[],
- const char* argv[], NPSavedData* saved) override;
+ NPError New(uint16 mode,
+ int16 argc,
+ const char* argn[],
+ 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 9611ecc..98452a9 100644
--- a/content/test/plugin/plugin_setup_test.h
+++ b/content/test/plugin/plugin_setup_test.h
@@ -16,7 +16,7 @@
PluginSetupTest(NPP id, NPNetscapeFuncs *host_functions);
// NPAPI SetWindow handler.
- virtual NPError SetWindow(NPWindow* pNPWindow) override;
+ 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 2840e329..06c13f5 100644
--- a/content/test/plugin/plugin_thread_async_call_test.h
+++ b/content/test/plugin/plugin_thread_async_call_test.h
@@ -18,12 +18,15 @@
class PluginThreadAsyncCallTest : public PluginTest {
public:
PluginThreadAsyncCallTest(NPP id, NPNetscapeFuncs *host_functions);
- virtual ~PluginThreadAsyncCallTest();
+ ~PluginThreadAsyncCallTest() override;
- virtual NPError New(uint16 mode, int16 argc, const char* argn[],
- const char* argv[], NPSavedData* saved) override;
+ NPError New(uint16 mode,
+ int16 argc,
+ const char* argn[],
+ const char* argv[],
+ NPSavedData* saved) override;
- virtual NPError Destroy() override;
+ 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 ea098de3..d8aaf22 100644
--- a/content/test/plugin/plugin_window_size_test.h
+++ b/content/test/plugin/plugin_window_size_test.h
@@ -17,7 +17,7 @@
// Constructor.
PluginWindowSizeTest(NPP id, NPNetscapeFuncs *host_functions);
// NPAPI SetWindow handler
- virtual NPError SetWindow(NPWindow* pNPWindow) override;
+ 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 53848ff..466d552 100644
--- a/content/test/plugin/plugin_windowless_test.h
+++ b/content/test/plugin/plugin_windowless_test.h
@@ -18,12 +18,15 @@
WindowlessPluginTest(NPP id, NPNetscapeFuncs *host_functions);
// These tests run in windowless plugin mode.
- virtual bool IsWindowless() const override;
+ 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;
+ NPError New(uint16 mode,
+ int16 argc,
+ const char* argn[],
+ const char* argv[],
+ NPSavedData* saved) override;
+ int16 HandleEvent(void* event) override;
protected:
NPError ExecuteScript(NPNetscapeFuncs* browser, NPP id,
diff --git a/content/test/test_content_browser_client.h b/content/test/test_content_browser_client.h
index 2e46b11d..7415b4f 100644
--- a/content/test/test_content_browser_client.h
+++ b/content/test/test_content_browser_client.h
@@ -18,8 +18,8 @@
class TestContentBrowserClient : public ContentBrowserClient {
public:
TestContentBrowserClient();
- virtual ~TestContentBrowserClient();
- virtual base::FilePath GetDefaultDownloadDirectory() override;
+ ~TestContentBrowserClient() override;
+ 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 9ae7d3b..2e12d4a 100644
--- a/content/test/test_content_client.h
+++ b/content/test/test_content_client.h
@@ -17,11 +17,11 @@
class TestContentClient : public ContentClient {
public:
TestContentClient();
- virtual ~TestContentClient();
+ ~TestContentClient() override;
// ContentClient:
- virtual std::string GetUserAgent() const override;
- virtual base::StringPiece GetDataResource(
+ std::string GetUserAgent() const override;
+ base::StringPiece GetDataResource(
int resource_id,
ui::ScaleFactor scale_factor) const override;
diff --git a/content/test/test_frame_navigation_observer.h b/content/test/test_frame_navigation_observer.h
index 7cbf57e..9ff42c53 100644
--- a/content/test/test_frame_navigation_observer.h
+++ b/content/test/test_frame_navigation_observer.h
@@ -32,7 +32,7 @@
// As above but waits for one navigation.
explicit TestFrameNavigationObserver(FrameTreeNode* node);
- virtual ~TestFrameNavigationObserver();
+ ~TestFrameNavigationObserver() override;
// Runs a nested message loop and blocks until the expected number of
// navigations are complete.
@@ -40,15 +40,13 @@
private:
// WebContentsObserver
- virtual void DidStartProvisionalLoadForFrame(
- RenderFrameHost* render_frame_host,
- const GURL& validated_url,
- bool is_error_page,
- bool is_iframe_srcdoc) override;
- virtual void DidNavigateAnyFrame(
- RenderFrameHost* render_frame_host,
- const LoadCommittedDetails& details,
- const FrameNavigateParams& params) override;
+ void DidStartProvisionalLoadForFrame(RenderFrameHost* render_frame_host,
+ const GURL& validated_url,
+ bool is_error_page,
+ bool is_iframe_srcdoc) override;
+ void DidNavigateAnyFrame(RenderFrameHost* render_frame_host,
+ const LoadCommittedDetails& details,
+ 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 042c9026..398be07 100644
--- a/content/test/test_media_stream_renderer_factory.h
+++ b/content/test/test_media_stream_renderer_factory.h
@@ -16,15 +16,15 @@
class TestMediaStreamRendererFactory : public MediaStreamRendererFactory {
public:
TestMediaStreamRendererFactory();
- virtual ~TestMediaStreamRendererFactory();
+ ~TestMediaStreamRendererFactory() override;
// MediaStreamRendererFactory implementation.
- virtual scoped_refptr<VideoFrameProvider> GetVideoFrameProvider(
+ scoped_refptr<VideoFrameProvider> GetVideoFrameProvider(
const GURL& url,
const base::Closure& error_cb,
const VideoFrameProvider::RepaintCB& repaint_cb) override;
- virtual scoped_refptr<MediaStreamAudioRenderer> GetAudioRenderer(
+ scoped_refptr<MediaStreamAudioRenderer> GetAudioRenderer(
const GURL& url,
int render_view_id,
int render_frame_id) override;
diff --git a/content/test/test_render_frame_host.h b/content/test/test_render_frame_host.h
index 025371f..506f1d4 100644
--- a/content/test/test_render_frame_host.h
+++ b/content/test/test_render_frame_host.h
@@ -21,10 +21,10 @@
class TestRenderFrameHostCreationObserver : public WebContentsObserver {
public:
explicit TestRenderFrameHostCreationObserver(WebContents* web_contents);
- virtual ~TestRenderFrameHostCreationObserver();
+ ~TestRenderFrameHostCreationObserver() override;
// WebContentsObserver implementation.
- virtual void RenderFrameCreated(RenderFrameHost* render_frame_host) override;
+ void RenderFrameCreated(RenderFrameHost* render_frame_host) override;
RenderFrameHost* last_created_frame() const { return last_created_frame_; }
@@ -41,23 +41,21 @@
FrameTreeNode* frame_tree_node,
int routing_id,
bool is_swapped_out);
- virtual ~TestRenderFrameHost();
+ ~TestRenderFrameHost() override;
// RenderFrameHostImpl overrides (same values, but in Test* types)
- virtual TestRenderViewHost* GetRenderViewHost() override;
+ TestRenderViewHost* GetRenderViewHost() override;
// RenderFrameHostTester implementation.
- virtual TestRenderFrameHost* AppendChild(
- const std::string& frame_name) 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;
- virtual void SetContentsMimeType(const std::string& mime_type) override;
- virtual void SendBeforeUnloadACK(bool proceed) override;
- virtual void SimulateSwapOutACK() override;
+ TestRenderFrameHost* AppendChild(const std::string& frame_name) override;
+ void SendNavigate(int page_id, const GURL& url) override;
+ void SendFailedNavigate(int page_id, const GURL& url) override;
+ void SendNavigateWithTransition(int page_id,
+ const GURL& url,
+ ui::PageTransition transition) override;
+ void SetContentsMimeType(const std::string& mime_type) override;
+ void SendBeforeUnloadACK(bool proceed) override;
+ void SimulateSwapOutACK() override;
void SendNavigateWithTransitionAndResponseCode(
int page_id,
diff --git a/content/test/test_render_frame_host_factory.h b/content/test/test_render_frame_host_factory.h
index 620e9c1..800091b 100644
--- a/content/test/test_render_frame_host_factory.h
+++ b/content/test/test_render_frame_host_factory.h
@@ -20,11 +20,11 @@
class TestRenderFrameHostFactory : public RenderFrameHostFactory {
public:
TestRenderFrameHostFactory();
- virtual ~TestRenderFrameHostFactory();
+ ~TestRenderFrameHostFactory() override;
protected:
// RenderFrameHostFactory implementation.
- virtual scoped_ptr<RenderFrameHostImpl> CreateRenderFrameHost(
+ scoped_ptr<RenderFrameHostImpl> CreateRenderFrameHost(
RenderViewHostImpl* render_view_host,
RenderFrameHostDelegate* delegate,
FrameTree* frame_tree,
diff --git a/content/test/test_render_view_host.h b/content/test/test_render_view_host.h
index e09c565..575d0bd 100644
--- a/content/test/test_render_view_host.h
+++ b/content/test/test_render_view_host.h
@@ -52,91 +52,88 @@
class TestRenderWidgetHostView : public RenderWidgetHostViewBase {
public:
explicit TestRenderWidgetHostView(RenderWidgetHost* rwh);
- virtual ~TestRenderWidgetHostView();
+ ~TestRenderWidgetHostView() override;
// 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;
+ void InitAsChild(gfx::NativeView parent_view) override {}
+ RenderWidgetHost* GetRenderWidgetHost() const override;
+ void SetSize(const gfx::Size& size) override {}
+ void SetBounds(const gfx::Rect& rect) override {}
+ gfx::Vector2dF GetLastScrollOffset() const override;
+ gfx::NativeView GetNativeView() const override;
+ gfx::NativeViewId GetNativeViewId() const override;
+ gfx::NativeViewAccessible GetNativeViewAccessible() override;
+ ui::TextInputClient* GetTextInputClient() override;
+ bool HasFocus() const override;
+ bool IsSurfaceAvailableForCopy() const override;
+ void Show() override;
+ void Hide() override;
+ bool IsShowing() override;
+ 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;
+ void SetActive(bool active) override;
+ void SetTakesFocusOnlyOnMouseDown(bool flag) override {}
+ void SetWindowVisibility(bool visible) override {}
+ void WindowFrameChanged() override {}
+ void ShowDefinitionForSelection() override {}
+ bool SupportsSpeech() const override;
+ void SpeakSelection() override;
+ bool IsSpeaking() const override;
+ void StopSpeaking() override;
#endif // defined(OS_MACOSX)
- virtual void OnSwapCompositorFrame(
- uint32 output_surface_id,
- scoped_ptr<cc::CompositorFrame> frame) override;
+ void OnSwapCompositorFrame(uint32 output_surface_id,
+ scoped_ptr<cc::CompositorFrame> frame) override;
// RenderWidgetHostViewBase implementation.
- virtual void InitAsPopup(RenderWidgetHostView* parent_host_view,
- const gfx::Rect& pos) override {}
- virtual void InitAsFullscreen(
- 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 {}
- virtual void TextInputTypeChanged(ui::TextInputType type,
- ui::TextInputMode input_mode,
- bool can_compose_inline) override {}
- virtual void ImeCancelComposition() override {}
+ void InitAsPopup(RenderWidgetHostView* parent_host_view,
+ const gfx::Rect& pos) override {}
+ void InitAsFullscreen(RenderWidgetHostView* reference_host_view) override {}
+ void WasShown() override {}
+ void WasHidden() override {}
+ void MovePluginWindows(const std::vector<WebPluginGeometry>& moves) override {
+ }
+ void Focus() override {}
+ void Blur() override {}
+ void SetIsLoading(bool is_loading) override {}
+ void UpdateCursor(const WebCursor& cursor) override {}
+ void TextInputTypeChanged(ui::TextInputType type,
+ ui::TextInputMode input_mode,
+ bool can_compose_inline) override {}
+ void ImeCancelComposition() override {}
#if defined(OS_MACOSX) || defined(USE_AURA)
- virtual void ImeCompositionRangeChanged(
+ void ImeCompositionRangeChanged(
const gfx::Range& range,
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 {}
- virtual void SelectionBoundsChanged(
+ void RenderProcessGone(base::TerminationStatus status,
+ int error_code) override;
+ void Destroy() override;
+ void SetTooltipText(const base::string16& tooltip_text) override {}
+ void SelectionBoundsChanged(
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;
- virtual void CopyFromCompositingSurfaceToVideoFrame(
+ void CopyFromCompositingSurface(const gfx::Rect& src_subrect,
+ const gfx::Size& dst_size,
+ CopyFromCompositingSurfaceCallback& callback,
+ const SkColorType color_type) override;
+ 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;
+ bool CanCopyToVideoFrame() const override;
+ bool HasAcceleratedSurface(const gfx::Size& desired_size) override;
#if defined(OS_MACOSX)
- virtual bool PostProcessEventForPluginIme(
+ bool PostProcessEventForPluginIme(
const NativeWebKeyboardEvent& event) override;
#endif
#if defined(OS_ANDROID)
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;
+ void GetScreenInfo(blink::WebScreenInfo* results) override {}
+ gfx::Rect GetBoundsInRootWindow() override;
+ gfx::GLSurfaceHandle GetCompositingSurface() override;
+ bool LockMouse() override;
+ void UnlockMouse() override;
#if defined(OS_WIN)
virtual void SetParentNativeViewAccessible(
gfx::NativeViewAccessible accessible_parent) override;
@@ -206,13 +203,13 @@
int routing_id,
int main_frame_routing_id,
bool swapped_out);
- virtual ~TestRenderViewHost();
+ ~TestRenderViewHost() override;
// RenderViewHostTester implementation. Note that CreateRenderView
// is not specified since it is synonymous with the one from
// RenderViewHostImpl, see below.
- virtual void SimulateWasHidden() override;
- virtual void SimulateWasShown() override;
+ void SimulateWasHidden() override;
+ void SimulateWasShown() override;
void TestOnUpdateStateWithFile(
int page_id, const base::FilePath& file_path);
@@ -236,13 +233,13 @@
// RenderViewHost overrides --------------------------------------------------
- virtual bool CreateRenderView(const base::string16& frame_name,
- 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 CreateRenderView(const base::string16& frame_name,
+ int opener_route_id,
+ int proxy_route_id,
+ int32 max_page_id,
+ bool window_was_created_with_opener) override;
+ bool IsRenderViewLive() const override;
+ 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 6413781..26bcfbb 100644
--- a/content/test/test_render_view_host_factory.h
+++ b/content/test/test_render_view_host_factory.h
@@ -23,11 +23,11 @@
class TestRenderViewHostFactory : public RenderViewHostFactory {
public:
explicit TestRenderViewHostFactory(RenderProcessHostFactory* rph_factory);
- virtual ~TestRenderViewHostFactory();
+ ~TestRenderViewHostFactory() override;
virtual void set_render_process_host_factory(
RenderProcessHostFactory* rph_factory);
- virtual RenderViewHost* CreateRenderViewHost(
+ RenderViewHost* CreateRenderViewHost(
SiteInstance* instance,
RenderViewHostDelegate* delegate,
RenderWidgetHostDelegate* widget_delegate,
diff --git a/content/test/test_video_frame_provider.h b/content/test/test_video_frame_provider.h
index 16b2008..0a320a2 100644
--- a/content/test/test_video_frame_provider.h
+++ b/content/test/test_video_frame_provider.h
@@ -29,13 +29,13 @@
const RepaintCB& repaint_cb);
// VideoFrameProvider implementation.
- virtual void Start() override;
- virtual void Stop() override;
- virtual void Play() override;
- virtual void Pause() override;
+ void Start() override;
+ void Stop() override;
+ void Play() override;
+ void Pause() override;
protected:
- virtual ~TestVideoFrameProvider();
+ ~TestVideoFrameProvider() override;
private:
enum State {
diff --git a/content/test/test_web_contents.h b/content/test/test_web_contents.h
index 5ddd706..83ce185 100644
--- a/content/test/test_web_contents.h
+++ b/content/test/test_web_contents.h
@@ -24,32 +24,31 @@
// and does not do anything involving views.
class TestWebContents : public WebContentsImpl, public WebContentsTester {
public:
- virtual ~TestWebContents();
+ ~TestWebContents() override;
static TestWebContents* Create(BrowserContext* browser_context,
SiteInstance* instance);
// WebContentsImpl overrides (returning the same values, but in Test* types)
- virtual TestRenderFrameHost* GetMainFrame() override;
- virtual TestRenderViewHost* GetRenderViewHost() const override;
+ TestRenderFrameHost* GetMainFrame() override;
+ 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 TestDidNavigate(RenderFrameHost* render_frame_host,
- int page_id,
- const GURL& url,
- 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;
+ void CommitPendingNavigation() override;
+ TestRenderFrameHost* GetPendingMainFrame() const override;
+ void NavigateAndCommit(const GURL& url) override;
+ void TestSetIsLoading(bool value) override;
+ void ProceedWithCrossSiteNavigation() override;
+ void TestDidNavigate(RenderFrameHost* render_frame_host,
+ int page_id,
+ const GURL& url,
+ ui::PageTransition transition) override;
+ void TestDidNavigateWithReferrer(RenderFrameHost* render_frame_host,
+ int page_id,
+ const GURL& url,
+ const Referrer& referrer,
+ ui::PageTransition transition) override;
+ WebPreferences TestComputeWebkitPrefs() override;
// State accessor.
bool cross_navigation_pending() {
@@ -57,19 +56,18 @@
}
// Prevent interaction with views.
- virtual bool CreateRenderViewForRenderManager(
- RenderViewHost* render_view_host,
- int opener_route_id,
- int proxy_routing_id,
- bool for_main_frame) override;
- virtual void UpdateRenderViewSizeForRenderManager() override {}
+ bool CreateRenderViewForRenderManager(RenderViewHost* render_view_host,
+ int opener_route_id,
+ int proxy_routing_id,
+ bool for_main_frame) override;
+ 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;
+ WebContents* Clone() override;
// Allow mocking of the RenderViewHostDelegateView.
- virtual RenderViewHostDelegateView* GetDelegateView() override;
+ RenderViewHostDelegateView* GetDelegateView() override;
void set_delegate_view(RenderViewHostDelegateView* view) {
delegate_view_override_ = view;
}
@@ -89,9 +87,9 @@
// Compares the arguments passed in with the expected arguments passed in
// to |ExpectSetHistoryLengthAndPrune()|.
- virtual void SetHistoryLengthAndPrune(const SiteInstance* site_instance,
- int history_length,
- int32 min_page_id) override;
+ void SetHistoryLengthAndPrune(const SiteInstance* site_instance,
+ int history_length,
+ int32 min_page_id) override;
void TestDidFinishLoad(const GURL& url);
void TestDidFailLoadWithError(const GURL& url,
@@ -104,25 +102,22 @@
private:
// WebContentsImpl overrides
- virtual void CreateNewWindow(
+ void CreateNewWindow(
int render_process_id,
int route_id,
int main_frame_route_id,
const ViewHostMsg_CreateWindow_Params& params,
SessionStorageNamespace* session_storage_namespace) override;
- virtual void CreateNewWidget(int render_process_id,
- int route_id,
- blink::WebPopupType popup_type) override;
- virtual void CreateNewFullscreenWidget(int render_process_id,
- int route_id) override;
- virtual void ShowCreatedWindow(int route_id,
- WindowOpenDisposition disposition,
- const gfx::Rect& initial_pos,
- bool user_gesture) override;
- virtual void ShowCreatedWidget(int route_id,
- const gfx::Rect& initial_pos) override;
- virtual void ShowCreatedFullscreenWidget(int route_id) override;
-
+ void CreateNewWidget(int render_process_id,
+ int route_id,
+ blink::WebPopupType popup_type) override;
+ void CreateNewFullscreenWidget(int render_process_id, int route_id) override;
+ void ShowCreatedWindow(int route_id,
+ WindowOpenDisposition disposition,
+ const gfx::Rect& initial_pos,
+ bool user_gesture) override;
+ void ShowCreatedWidget(int route_id, const gfx::Rect& initial_pos) override;
+ void ShowCreatedFullscreenWidget(int route_id) override;
RenderViewHostDelegateView* delegate_view_override_;
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 7162917..0d5c2db 100644
--- a/content/test/web_layer_tree_view_impl_for_testing.h
+++ b/content/test/web_layer_tree_view_impl_for_testing.h
@@ -65,27 +65,27 @@
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 ApplyViewportDeltas(const gfx::Vector2d& inner_delta,
- const gfx::Vector2d& outer_delta,
- float page_scale,
- 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 {}
+ void WillBeginMainFrame(int frame_id) override {}
+ void DidBeginMainFrame() override {}
+ void BeginMainFrame(const cc::BeginFrameArgs& args) override {}
+ void Layout() override;
+ void ApplyViewportDeltas(const gfx::Vector2d& inner_delta,
+ const gfx::Vector2d& outer_delta,
+ float page_scale,
+ float top_controls_delta) override;
+ void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta,
+ float page_scale,
+ float top_controls_delta) override;
+ void RequestNewOutputSurface(bool fallback) override;
+ void DidInitializeOutputSurface() override {}
+ void WillCommit() override {}
+ void DidCommit() override {}
+ void DidCommitAndDrawFrame() override {}
+ void DidCompleteSwapBuffers() override {}
// cc::LayerTreeHostSingleThreadClient implementation.
- virtual void DidPostSwapBuffers() override {}
- virtual void DidAbortSwapBuffers() override {}
+ void DidPostSwapBuffers() override {}
+ 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 719bd48..c6018bd 100644
--- a/content/test/webrtc_content_browsertest_base.h
+++ b/content/test/webrtc_content_browsertest_base.h
@@ -13,7 +13,7 @@
// Contains stuff WebRTC browsertests have in common.
class WebRtcContentBrowserTest: public ContentBrowserTest {
public:
- virtual void SetUpCommandLine(base::CommandLine* command_line) override;
+ void SetUpCommandLine(base::CommandLine* command_line) override;
virtual void SetUp() override;
virtual void TearDown() override;
