Index: chrome/browser/external_protocol/external_protocol_handler_unittest.cc |
diff --git a/chrome/browser/external_protocol/external_protocol_handler_unittest.cc b/chrome/browser/external_protocol/external_protocol_handler_unittest.cc |
index fdbfe2868d3b1c672d643315a8999687f5dc3ee7..4518b75e4cc994ddc859f2e6c819f9478b230640 100644 |
--- a/chrome/browser/external_protocol/external_protocol_handler_unittest.cc |
+++ b/chrome/browser/external_protocol/external_protocol_handler_unittest.cc |
@@ -21,15 +21,13 @@ class FakeExternalProtocolHandlerWorker |
os_state_(os_state) {} |
private: |
- virtual ~FakeExternalProtocolHandlerWorker() {} |
+ ~FakeExternalProtocolHandlerWorker() override {} |
- virtual ShellIntegration::DefaultWebClientState CheckIsDefault() override { |
+ ShellIntegration::DefaultWebClientState CheckIsDefault() override { |
return os_state_; |
} |
- virtual bool SetAsDefault(bool interactive_permitted) override { |
- return true; |
- } |
+ bool SetAsDefault(bool interactive_permitted) override { return true; } |
ShellIntegration::DefaultWebClientState os_state_; |
}; |
@@ -44,38 +42,38 @@ class FakeExternalProtocolHandlerDelegate |
has_prompted_(false), |
has_blocked_ (false) {} |
- virtual ShellIntegration::DefaultProtocolClientWorker* CreateShellWorker( |
+ ShellIntegration::DefaultProtocolClientWorker* CreateShellWorker( |
ShellIntegration::DefaultWebClientObserver* observer, |
const std::string& protocol) override { |
return new FakeExternalProtocolHandlerWorker(observer, protocol, os_state_); |
} |
- virtual ExternalProtocolHandler::BlockState GetBlockState( |
+ ExternalProtocolHandler::BlockState GetBlockState( |
const std::string& scheme) override { |
return block_state_; |
} |
- virtual void BlockRequest() override { |
+ void BlockRequest() override { |
ASSERT_TRUE(block_state_ == ExternalProtocolHandler::BLOCK || |
os_state_ == ShellIntegration::IS_DEFAULT); |
has_blocked_ = true; |
} |
- virtual void RunExternalProtocolDialog(const GURL& url, |
- int render_process_host_id, |
- int routing_id) override { |
+ void RunExternalProtocolDialog(const GURL& url, |
+ int render_process_host_id, |
+ int routing_id) override { |
ASSERT_EQ(block_state_, ExternalProtocolHandler::UNKNOWN); |
ASSERT_NE(os_state_, ShellIntegration::IS_DEFAULT); |
has_prompted_ = true; |
} |
- virtual void LaunchUrlWithoutSecurityCheck(const GURL& url) override { |
+ void LaunchUrlWithoutSecurityCheck(const GURL& url) override { |
ASSERT_EQ(block_state_, ExternalProtocolHandler::DONT_BLOCK); |
ASSERT_NE(os_state_, ShellIntegration::IS_DEFAULT); |
has_launched_ = true; |
} |
- virtual void FinishedProcessingCheck() override { |
+ void FinishedProcessingCheck() override { |
base::MessageLoop::current()->Quit(); |
} |