| Index: chrome/browser/extensions/extension_bindings_apitest.cc
|
| diff --git a/chrome/browser/extensions/extension_bindings_apitest.cc b/chrome/browser/extensions/extension_bindings_apitest.cc
|
| index b090c840059349e9b2cea4903dacb98ac094cae7..3b15f0f5d7a80c74af366af2b562060620c07393 100644
|
| --- a/chrome/browser/extensions/extension_bindings_apitest.cc
|
| +++ b/chrome/browser/extensions/extension_bindings_apitest.cc
|
| @@ -17,6 +17,7 @@
|
| #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 {
|
| @@ -26,6 +27,9 @@ 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));
|
| @@ -117,8 +121,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionBindingsApiTest, ModuleSystem) {
|
| }
|
|
|
| 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(
|
| @@ -141,8 +143,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionBindingsApiTest, NoExportOverriding) {
|
| }
|
|
|
| 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(
|
| @@ -167,7 +167,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionBindingsApiTest, NoGinDefineOverriding) {
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(ExtensionBindingsApiTest, HandlerFunctionTypeChecking) {
|
| - ASSERT_TRUE(embedded_test_server()->Start());
|
| ui_test_utils::NavigateToURL(
|
| browser(),
|
| embedded_test_server()->GetURL(
|
| @@ -187,8 +186,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionBindingsApiTest, HandlerFunctionTypeChecking) {
|
|
|
| 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(
|
| @@ -245,7 +242,6 @@ IN_PROC_BROWSER_TEST_F(FramesExtensionBindingsApiTest, FramesBeforeNavigation) {
|
| // 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(
|
| @@ -271,7 +267,6 @@ IN_PROC_BROWSER_TEST_F(FramesExtensionBindingsApiTest, FramesBeforeNavigation) {
|
| }
|
|
|
| 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"));
|
| @@ -280,5 +275,18 @@ IN_PROC_BROWSER_TEST_F(ExtensionBindingsApiTest, TestFreezingChrome) {
|
| 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
|
|
|