Revert of Fix the handling of user gestures for external protocol handler dialogs.

chrome/browser/external_protocol/external_protocol_handler_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/external_protocol/external_protocol_handler.h"
 
 #include "base/message_loop/message_loop.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 33 matching lines @@
         has_prompted_(false),
         has_blocked_ (false) {}
 
   virtual ShellIntegration::DefaultProtocolClientWorker* CreateShellWorker(
       ShellIntegration::DefaultWebClientObserver* observer,
       const std::string& protocol) OVERRIDE {
     return new FakeExternalProtocolHandlerWorker(observer, protocol, os_state_);
   }
 
   virtual ExternalProtocolHandler::BlockState GetBlockState(
-      const std::string& scheme,
-      bool initiated_by_user_gesture) OVERRIDE { return block_state_; }
+      const std::string& scheme) OVERRIDE {
+    return block_state_;
+  }
 
   virtual 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 {
@@ skipping 35 matching lines @@
 class ExternalProtocolHandlerTest : public testing::Test {
  protected:
   ExternalProtocolHandlerTest()
       : ui_thread_(BrowserThread::UI, base::MessageLoop::current()),
         file_thread_(BrowserThread::FILE) {}
 
   virtual void SetUp() {
     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) {
     GURL url("mailto:test@test.com");
     ASSERT_FALSE(delegate_.has_prompted());
     ASSERT_FALSE(delegate_.has_launched());
     ASSERT_FALSE(delegate_.has_blocked());
 
     delegate_.set_block_state(block_state);
     delegate_.set_os_state(os_state);
-    ExternalProtocolHandler::LaunchUrlWithDelegate(url, 0, 0, &delegate_, true);
+    ExternalProtocolHandler::LaunchUrlWithDelegate(url, 0, 0, &delegate_);
     if (block_state != ExternalProtocolHandler::BLOCK)
       base::MessageLoop::current()->Run();
 
     ASSERT_EQ(should_prompt, delegate_.has_prompted());
     ASSERT_EQ(should_launch, delegate_.has_launched());
     ASSERT_EQ(should_block, delegate_.has_blocked());
   }
 
   base::MessageLoopForUI ui_message_loop_;
   content::TestBrowserThread ui_thread_;
@@ skipping 48 matching lines @@
   DoTest(ExternalProtocolHandler::UNKNOWN,
          ShellIntegration::NOT_DEFAULT,
          true, false, false);
 }
 
 TEST_F(ExternalProtocolHandlerTest, TestLaunchSchemeUnknownChromeUnknown) {
   DoTest(ExternalProtocolHandler::UNKNOWN,
          ShellIntegration::UNKNOWN_DEFAULT,
          true, false, false);
 }