Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(196)

Unified Diff: chrome/browser/external_protocol/external_protocol_handler_unittest.cc

Issue 131783012: Fix the handling of user gestures for external protocol handler dialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix build Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..5eadf60d62ad20d8079fd9ed3d29b302e5defdb4 100644
--- a/chrome/browser/external_protocol/external_protocol_handler_unittest.cc
+++ b/chrome/browser/external_protocol/external_protocol_handler_unittest.cc
@@ -51,7 +51,9 @@ class FakeExternalProtocolHandlerDelegate
}
virtual ExternalProtocolHandler::BlockState GetBlockState(
- const std::string& scheme) OVERRIDE { return block_state_; }
+ const std::string& scheme, bool user_gesture) OVERRIDE {
+ return block_state_;
+ }
virtual void BlockRequest() OVERRIDE {
ASSERT_TRUE(block_state_ == ExternalProtocolHandler::BLOCK ||
@@ -107,11 +109,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 +119,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();

Powered by Google App Engine
This is Rietveld 408576698