| Index: chrome/browser/devtools/devtools_sanity_browsertest.cc
|
| diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc
|
| index 7aca3686a5c0cd6e9027f0da7da889297f6c04a5..eb7d5612c9e63108fa5015d7cf2128fefcb81853 100644
|
| --- a/chrome/browser/devtools/devtools_sanity_browsertest.cc
|
| +++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc
|
| @@ -159,7 +159,7 @@ class DevToolsWindowBeforeUnloadObserver
|
| void Wait();
|
| private:
|
| // Invoked when the beforeunload handler fires.
|
| - virtual void BeforeUnloadFired(const base::TimeTicks& proceed_time) override;
|
| + void BeforeUnloadFired(const base::TimeTicks& proceed_time) override;
|
|
|
| bool m_fired;
|
| scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
|
| @@ -189,7 +189,7 @@ void DevToolsWindowBeforeUnloadObserver::BeforeUnloadFired(
|
|
|
| class DevToolsBeforeUnloadTest: public DevToolsSanityTest {
|
| public:
|
| - virtual void SetUpCommandLine(CommandLine* command_line) override {
|
| + void SetUpCommandLine(CommandLine* command_line) override {
|
| command_line->AppendSwitch(
|
| switches::kDisableHangMonitor);
|
| }
|
| @@ -286,7 +286,7 @@ class DevToolsBeforeUnloadTest: public DevToolsSanityTest {
|
|
|
| class DevToolsUnresponsiveBeforeUnloadTest: public DevToolsBeforeUnloadTest {
|
| public:
|
| - virtual void SetUpCommandLine(CommandLine* command_line) override {}
|
| + void SetUpCommandLine(CommandLine* command_line) override {}
|
| };
|
|
|
| void TimeoutCallback(const std::string& timeout_message) {
|
| @@ -368,9 +368,9 @@ class DevToolsExtensionTest : public DevToolsSanityTest,
|
| return true;
|
| }
|
|
|
| - virtual void Observe(int type,
|
| - const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) override {
|
| + void Observe(int type,
|
| + const content::NotificationSource& source,
|
| + const content::NotificationDetails& details) override {
|
| switch (type) {
|
| case extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED:
|
| case extensions::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING:
|
| @@ -387,7 +387,7 @@ class DevToolsExtensionTest : public DevToolsSanityTest,
|
|
|
| class DevToolsExperimentalExtensionTest : public DevToolsExtensionTest {
|
| public:
|
| - virtual void SetUpCommandLine(CommandLine* command_line) override {
|
| + void SetUpCommandLine(CommandLine* command_line) override {
|
| command_line->AppendSwitch(
|
| extensions::switches::kEnableExperimentalExtensionApis);
|
| }
|
| @@ -416,13 +416,12 @@ class WorkerDevToolsSanityTest : public InProcessBrowserTest {
|
| : path_(path), worker_data_(worker_data) {}
|
|
|
| private:
|
| - virtual ~WorkerCreationObserver() {}
|
| + ~WorkerCreationObserver() override {}
|
|
|
| - virtual void WorkerCreated (
|
| - const GURL& url,
|
| - const base::string16& name,
|
| - int process_id,
|
| - int route_id) override {
|
| + void WorkerCreated(const GURL& url,
|
| + const base::string16& name,
|
| + int process_id,
|
| + int route_id) override {
|
| if (url.path().rfind(path_) == std::string::npos)
|
| return;
|
| worker_data_->worker_process_id = process_id;
|
| @@ -443,9 +442,9 @@ class WorkerDevToolsSanityTest : public InProcessBrowserTest {
|
| }
|
|
|
| private:
|
| - virtual ~WorkerTerminationObserver() {}
|
| + ~WorkerTerminationObserver() override {}
|
|
|
| - virtual void WorkerDestroyed(int process_id, int route_id) override {
|
| + void WorkerDestroyed(int process_id, int route_id) override {
|
| ASSERT_EQ(worker_data_->worker_process_id, process_id);
|
| ASSERT_EQ(worker_data_->worker_route_id, route_id);
|
| WorkerService::GetInstance()->RemoveObserver(this);
|
| @@ -919,7 +918,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsAgentHostTest, TestAgentHostReleased) {
|
| }
|
|
|
| class RemoteDebuggingTest: public ExtensionApiTest {
|
| - virtual void SetUpCommandLine(CommandLine* command_line) override {
|
| + void SetUpCommandLine(CommandLine* command_line) override {
|
| ExtensionApiTest::SetUpCommandLine(command_line);
|
| command_line->AppendSwitchASCII(switches::kRemoteDebuggingPort, "9222");
|
|
|
|
|