| 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 cce6ba2dacac4b7d415112bb50a4669159aef7c7..fdbfe2868d3b1c672d643315a8999687f5dc3ee7 100644
|
| --- a/chrome/browser/external_protocol/external_protocol_handler_unittest.cc
|
| +++ b/chrome/browser/external_protocol/external_protocol_handler_unittest.cc
|
| @@ -23,11 +23,11 @@ class FakeExternalProtocolHandlerWorker
|
| private:
|
| virtual ~FakeExternalProtocolHandlerWorker() {}
|
|
|
| - virtual ShellIntegration::DefaultWebClientState CheckIsDefault() OVERRIDE {
|
| + virtual ShellIntegration::DefaultWebClientState CheckIsDefault() override {
|
| return os_state_;
|
| }
|
|
|
| - virtual bool SetAsDefault(bool interactive_permitted) OVERRIDE {
|
| + virtual bool SetAsDefault(bool interactive_permitted) override {
|
| return true;
|
| }
|
|
|
| @@ -46,16 +46,16 @@ class FakeExternalProtocolHandlerDelegate
|
|
|
| virtual ShellIntegration::DefaultProtocolClientWorker* CreateShellWorker(
|
| ShellIntegration::DefaultWebClientObserver* observer,
|
| - const std::string& protocol) OVERRIDE {
|
| + const std::string& protocol) override {
|
| return new FakeExternalProtocolHandlerWorker(observer, protocol, os_state_);
|
| }
|
|
|
| virtual ExternalProtocolHandler::BlockState GetBlockState(
|
| - const std::string& scheme) OVERRIDE {
|
| + const std::string& scheme) override {
|
| return block_state_;
|
| }
|
|
|
| - virtual void BlockRequest() OVERRIDE {
|
| + virtual void BlockRequest() override {
|
| ASSERT_TRUE(block_state_ == ExternalProtocolHandler::BLOCK ||
|
| os_state_ == ShellIntegration::IS_DEFAULT);
|
| has_blocked_ = true;
|
| @@ -63,19 +63,19 @@ class FakeExternalProtocolHandlerDelegate
|
|
|
| virtual void RunExternalProtocolDialog(const GURL& url,
|
| int render_process_host_id,
|
| - int routing_id) OVERRIDE {
|
| + 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 {
|
| + virtual 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 {
|
| + virtual void FinishedProcessingCheck() override {
|
| base::MessageLoop::current()->Quit();
|
| }
|
|
|
|
|