Revert of [Extensions Bindings] Avoid passing the event filter to JS

chrome/browser/extensions/extension_bindings_apitest.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.
 
 // Contains holistic tests of the bindings infrastructure
 
 #include "chrome/browser/extensions/api/permissions/permissions_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/test/extension_test_message_listener.h"
 #include "extensions/test/result_catcher.h"
-#include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 
 namespace extensions {
 namespace {
 
 class ExtensionBindingsApiTest : public ExtensionApiTest {
  public:
   void SetUpOnMainThread() override {
     ExtensionApiTest::SetUpOnMainThread();
-    host_resolver()->AddRule("*", "127.0.0.1");
-    ASSERT_TRUE(StartEmbeddedTestServer());
-
     content::BrowserThread::PostTask(
         content::BrowserThread::IO, FROM_HERE,
         base::BindOnce(&chrome_browser_net::SetUrlRequestMocksEnabled, true));
   }
 };
 
 IN_PROC_BROWSER_TEST_F(ExtensionBindingsApiTest,
                        UnavailableBindingsNeverRegistered) {
   // Test will request the 'storage' permission.
   PermissionsRequestFunction::SetIgnoreUserGestureForTests(true);
@@ skipping 71 matching lines @@
   ASSERT_TRUE(RunExtensionTest("bindings/api_enums")) << message_;
 };
 
 // Regression test for http://crbug.com/504011 - proper access checks on
 // getModuleSystem().
 IN_PROC_BROWSER_TEST_F(ExtensionBindingsApiTest, ModuleSystem) {
   ASSERT_TRUE(RunExtensionTest("bindings/module_system")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionBindingsApiTest, NoExportOverriding) {
+  ASSERT_TRUE(embedded_test_server()->Start());
+
   // We need to create runtime bindings in the web page. An extension that's
   // externally connectable will do that for us.
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("bindings")
                     .AppendASCII("externally_connectable_everywhere")));
 
   ui_test_utils::NavigateToURL(
       browser(),
       embedded_test_server()->GetURL(
           "/extensions/api_test/bindings/override_exports.html"));
 
   // See chrome/test/data/extensions/api_test/bindings/override_exports.html.
   std::string result;
   EXPECT_TRUE(content::ExecuteScriptAndExtractString(
       browser()->tab_strip_model()->GetActiveWebContents(),
       "window.domAutomationController.send("
           "document.getElementById('status').textContent.trim());",
       &result));
   EXPECT_EQ("success", result);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionBindingsApiTest, NoGinDefineOverriding) {
+  ASSERT_TRUE(embedded_test_server()->Start());
+
   // We need to create runtime bindings in the web page. An extension that's
   // externally connectable will do that for us.
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("bindings")
                     .AppendASCII("externally_connectable_everywhere")));
 
   ui_test_utils::NavigateToURL(
       browser(),
       embedded_test_server()->GetURL(
           "/extensions/api_test/bindings/override_gin_define.html"));
   ASSERT_FALSE(
       browser()->tab_strip_model()->GetActiveWebContents()->IsCrashed());
 
   // See chrome/test/data/extensions/api_test/bindings/override_gin_define.html.
   std::string result;
   EXPECT_TRUE(content::ExecuteScriptAndExtractString(
       browser()->tab_strip_model()->GetActiveWebContents(),
       "window.domAutomationController.send("
           "document.getElementById('status').textContent.trim());",
       &result));
   EXPECT_EQ("success", result);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionBindingsApiTest, HandlerFunctionTypeChecking) {
+  ASSERT_TRUE(embedded_test_server()->Start());
   ui_test_utils::NavigateToURL(
       browser(),
       embedded_test_server()->GetURL(
           "/extensions/api_test/bindings/handler_function_type_checking.html"));
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_FALSE(web_contents->IsCrashed());
   // See handler_function_type_checking.html.
   std::string result;
   EXPECT_TRUE(content::ExecuteScriptAndExtractString(
       web_contents,
       "window.domAutomationController.send("
           "document.getElementById('status').textContent.trim());",
       &result));
   EXPECT_EQ("success", result);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionBindingsApiTest,
                        MoreNativeFunctionInterceptionTests) {
+  ASSERT_TRUE(embedded_test_server()->Start());
+
   // We need to create runtime bindings in the web page. An extension that's
   // externally connectable will do that for us.
   ASSERT_TRUE(
       LoadExtension(test_data_dir_.AppendASCII("bindings")
                         .AppendASCII("externally_connectable_everywhere")));
 
   ui_test_utils::NavigateToURL(
       browser(),
       embedded_test_server()->GetURL(
           "/extensions/api_test/bindings/function_interceptions.html"));
@@ skipping 36 matching lines @@
   ExtensionTestMessageListener receiver_ready("receiver_ready", false);
   const Extension* receiver =
       LoadExtension(test_data_dir_.AppendASCII("bindings")
                         .AppendASCII("external_message_listener"));
   ASSERT_NE(nullptr, receiver);
   ASSERT_TRUE(receiver_ready.WaitUntilSatisfied());
 
   // Load the web page which tries to impersonate the sender extension via
   // scripting iframes/child windows before they finish navigating to pages
   // within the sender extension.
+  ASSERT_TRUE(embedded_test_server()->Start());
   ui_test_utils::NavigateToURL(
       browser(),
       embedded_test_server()->GetURL(
           "/extensions/api_test/bindings/frames_before_navigation.html"));
 
   bool page_success = false;
   ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       browser()->tab_strip_model()->GetWebContentsAt(0), "getResult()",
       &page_success));
   EXPECT_TRUE(page_success);
 
   // Reply to |sender|, causing it to send a message over to |receiver|, and
   // then ask |receiver| for the total message count. It should be 1 since
   // |receiver| should not have received any impersonated messages.
   sender_ready.Reply(receiver->id());
   int message_count = 0;
   ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
       ProcessManager::Get(profile())
           ->GetBackgroundHostForExtension(receiver->id())
           ->host_contents(),
       "getMessageCountAfterReceivingRealSenderMessage()", &message_count));
   EXPECT_EQ(1, message_count);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionBindingsApiTest, TestFreezingChrome) {
+  ASSERT_TRUE(embedded_test_server()->Start());
   ui_test_utils::NavigateToURL(
       browser(), embedded_test_server()->GetURL(
                      "/extensions/api_test/bindings/freeze.html"));
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_FALSE(web_contents->IsCrashed());
 }
 
-// Tests interaction with event filter parsing.
-IN_PROC_BROWSER_TEST_F(ExtensionBindingsApiTest, TestEventFilterParsing) {
-  ExtensionTestMessageListener listener("ready", false);
-  ASSERT_TRUE(
-      LoadExtension(test_data_dir_.AppendASCII("bindings/event_filter")));
-  ASSERT_TRUE(listener.WaitUntilSatisfied());
-
-  ResultCatcher catcher;
-  ui_test_utils::NavigateToURL(
-      browser(), embedded_test_server()->GetURL("example.com", "/title1.html"));
-  ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
-}
-
 }  // namespace
 }  // namespace extensions