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

Unified Diff: chrome/browser/extensions/service_worker_apitest.cc

Issue 1880933002: Begin to enable extension APIs in Extension Service Worker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments -> round 1 Created 4 years, 8 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/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

Powered by Google App Engine
This is Rietveld 408576698