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

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

Issue 2943583002: [extension SW] Support lazy events from extension service workers. (Closed)
Patch Set: Created 3 years, 6 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 54dc7462cf1f94b9dd4d7bf0aad1ec034f52eea8..8af0b2399dd601607f03f6b0975c98f155dfd55f 100644
--- a/chrome/browser/extensions/service_worker_apitest.cc
+++ b/chrome/browser/extensions/service_worker_apitest.cc
@@ -36,6 +36,7 @@
#include "content/public/common/page_type.h"
#include "content/public/test/background_sync_test_util.h"
#include "content/public/test/browser_test_utils.h"
+#include "content/public/test/service_worker_test_helpers.h"
#include "extensions/browser/extension_host.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/process_manager.h"
@@ -43,6 +44,7 @@
#include "extensions/test/extension_test_message_listener.h"
#include "net/dns/mock_host_resolver.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
+#include "url/url_constants.h"
namespace extensions {
@@ -65,6 +67,11 @@ content::WebContents* AddTab(Browser* browser, const GURL& url) {
return browser->tab_strip_model()->GetActiveWebContents();
}
+GURL GetOriginForExtension(const ExtensionId& extension_id) {
Devlin 2017/06/16 02:34:41 Is this different than extension->url()?
lazyboy 2017/06/16 18:48:04 You're right. Fixed.
+ return GURL(std::string(kExtensionScheme) + url::kStandardSchemeSeparator +
+ extension_id);
+}
+
class WebContentsLoadStopObserver : content::WebContentsObserver {
public:
explicit WebContentsLoadStopObserver(content::WebContents* web_contents)
@@ -682,6 +689,42 @@ IN_PROC_BROWSER_TEST_F(ServiceWorkerTest, Events) {
ASSERT_EQ("chrome.tabs.onUpdated callback", result);
}
+IN_PROC_BROWSER_TEST_F(ServiceWorkerTest, EventsToStoppedWorker) {
+ // Extensions APIs from SW are only enabled on trunk.
+ ScopedCurrentChannel current_channel_override(version_info::Channel::UNKNOWN);
+ const Extension* extension = LoadExtensionWithFlags(
+ test_data_dir_.AppendASCII("service_worker/events_to_stopped_worker"),
+ kFlagNone);
+ ASSERT_TRUE(extension);
+ ui_test_utils::NavigateToURL(browser(),
+ extension->GetResourceURL("page.html"));
+ content::WebContents* web_contents =
+ browser()->tab_strip_model()->GetActiveWebContents();
+ {
+ content::StoragePartition* storage_partition =
+ content::BrowserContext::GetDefaultStoragePartition(
+ browser()->profile());
+ std::string result;
+ ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+ web_contents, "window.runServiceWorker()", &result));
+ ASSERT_EQ("ready", result);
+
+ {
+ base::RunLoop stop_called_run_loop;
+ content::StopServiceWorkerAtOrigin(
Devlin 2017/06/16 02:34:42 can we move the storage_partition var into this sc
lazyboy 2017/06/16 18:48:04 Done.
+ storage_partition->GetServiceWorkerContext(),
+ GetOriginForExtension(extension->id()),
+ stop_called_run_loop.QuitClosure());
+ stop_called_run_loop.Run();
+ }
Devlin 2017/06/16 02:34:41 Is there a simple method we can use to EXPECT_ tha
lazyboy 2017/06/16 18:48:04 Not that I know of, hopefully StoppedObserver will
+ }
+
+ std::string result;
+ ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+ web_contents, "window.createTabThenUpdate()", &result));
+ ASSERT_EQ("chrome.tabs.onUpdated callback", result);
+}
+
// Tests that worker ref count increments while extension API function is
// active.

Powered by Google App Engine
This is Rietveld 408576698