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 57a6db6049b1628d2d58e6f639d12d5837c4ad58..0b27465e98f17b5d7061d50224b26ed7f73e75f2 100644 |
--- a/chrome/browser/external_protocol/external_protocol_handler_unittest.cc |
+++ b/chrome/browser/external_protocol/external_protocol_handler_unittest.cc |
@@ -51,7 +51,8 @@ class FakeExternalProtocolHandlerDelegate |
} |
virtual ExternalProtocolHandler::BlockState GetBlockState( |
- const std::string& scheme) OVERRIDE { return block_state_; } |
+ const std::string& scheme, |
+ bool initiated_by_user_gesture) OVERRIDE { return block_state_; } |
virtual void BlockRequest() OVERRIDE { |
ASSERT_TRUE(block_state_ == ExternalProtocolHandler::BLOCK || |
@@ -107,11 +108,6 @@ class ExternalProtocolHandlerTest : public testing::Test { |
file_thread_.Start(); |
} |
- virtual void TearDown() { |
- // Ensure that g_accept_requests gets set back to true after test execution. |
- ExternalProtocolHandler::PermitLaunchUrl(); |
- } |
- |
void DoTest(ExternalProtocolHandler::BlockState block_state, |
ShellIntegration::DefaultWebClientState os_state, |
bool should_prompt, bool should_launch, bool should_block) { |
@@ -122,7 +118,7 @@ class ExternalProtocolHandlerTest : public testing::Test { |
delegate_.set_block_state(block_state); |
delegate_.set_os_state(os_state); |
- ExternalProtocolHandler::LaunchUrlWithDelegate(url, 0, 0, &delegate_); |
+ ExternalProtocolHandler::LaunchUrlWithDelegate(url, 0, 0, &delegate_, true); |
if (block_state != ExternalProtocolHandler::BLOCK) |
base::MessageLoop::current()->Run(); |