Chromium Code Reviews| Index: chrome/browser/extensions/service_worker_apitest.cc |
| diff --git a/chrome/browser/extensions/service_worker_apitest.cc b/chrome/browser/extensions/service_worker_apitest.cc |
| index 6dddcb332f7e68798176a47d75dfb2a7c68d773b..955840c94c27c5d472dcc224174f445afb7f9d15 100644 |
| --- a/chrome/browser/extensions/service_worker_apitest.cc |
| +++ b/chrome/browser/extensions/service_worker_apitest.cc |
| @@ -29,6 +29,7 @@ |
| #include "extensions/browser/extension_host.h" |
| #include "extensions/browser/extension_registry.h" |
| #include "extensions/browser/process_manager.h" |
| +#include "extensions/common/features/feature_util.h" |
| #include "extensions/test/background_page_watcher.h" |
| #include "extensions/test/extension_test_message_listener.h" |
| #include "net/test/embedded_test_server/embedded_test_server.h" |
| @@ -80,6 +81,23 @@ class WebContentsLoadStopObserver : content::WebContentsObserver { |
| DISALLOW_COPY_AND_ASSIGN(WebContentsLoadStopObserver); |
| }; |
| +class ScopedExtensionAPIInServiceWorkerEnabler { |
| + public: |
| + ScopedExtensionAPIInServiceWorkerEnabler() |
| + : current_value_( |
| + feature_util::ExtensionAPIEnabledInExtensionServiceWorkers()) { |
| + feature_util::SetExtensionAPIEnabledInExtensionServiceWorkers(true); |
| + } |
| + ~ScopedExtensionAPIInServiceWorkerEnabler() { |
| + feature_util::SetExtensionAPIEnabledInExtensionServiceWorkers( |
| + current_value_); |
| + } |
| + |
| + private: |
| + bool current_value_; |
| + DISALLOW_COPY_AND_ASSIGN(ScopedExtensionAPIInServiceWorkerEnabler); |
| +}; |
| + |
| } // namespace |
| class ServiceWorkerTest : public ExtensionApiTest { |
| @@ -604,6 +622,27 @@ IN_PROC_BROWSER_TEST_F(ServiceWorkerTest, WebAccessibleResourcesFetch) { |
| "service_worker/web_accessible_resources/fetch/", "page.html")); |
| } |
| +IN_PROC_BROWSER_TEST_F(ServiceWorkerTest, TabsCreate) { |
| + ScopedExtensionAPIInServiceWorkerEnabler enabler; |
| + const Extension* extension = LoadExtensionWithFlags( |
| + test_data_dir_.AppendASCII("service_worker/tabs_create"), kFlagNone); |
| + ASSERT_TRUE(extension); |
| + ui_test_utils::NavigateToURL(browser(), |
| + extension->GetResourceURL("page.html")); |
| + content::WebContents* web_contents = |
| + browser()->tab_strip_model()->GetActiveWebContents(); |
| + |
| + int starting_tab_count = browser()->tab_strip_model()->count(); |
| + std::string result; |
| + ASSERT_TRUE(content::ExecuteScriptAndExtractString( |
| + web_contents, "window.runServiceWorker()", &result)); |
|
Devlin
2016/04/14 22:34:52
Shouldn't we check |result|?
lazyboy
2016/04/15 00:57:47
Wow, this got deleted somehow.
Fixed.
|
| + EXPECT_EQ(starting_tab_count + 1, browser()->tab_strip_model()->count()); |
| + |
| + // Check extension shutdown path. |
| + UnloadExtension(extension->id()); |
| + EXPECT_EQ(starting_tab_count, browser()->tab_strip_model()->count()); |
| +} |
| + |
| // This test loads a web page that has an iframe pointing to a |
| // chrome-extension:// URL. The URL is listed in the extension's |
| // web_accessible_resources. Initially the iframe is served from the extension's |