Use url::Origin for StopAllServiceWorkersForOrigin

The service worker codebase currently uses a lot of GURLs for origins.
However, url::Origin should be used for origin instead of GURL where
possible due to security decisions.

This CL changes ServiceWorkerContextWrapper::
StopAllServiceWorkersForOrigin to use url::Origin instead of GURL.
Some relevant callsites have also been modified accordingly.

Bug: 1095896
Change-Id: I8571beeb38dc0dedc944e73521475bb518c8b9e3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2410066Reviewed-by: David Bertoni <dbertoni@chromium.org>
Reviewed-by: Matt Falkenhagen <falken@chromium.org>
Reviewed-by: Ahmed Fakhry <afakhry@chromium.org>
Reviewed-by: François Doray <fdoray@chromium.org>
Commit-Queue: Nidhi Jaju <nidhijaju127@gmail.com>
Cr-Commit-Position: refs/heads/master@{#810499}

chrome/browser/chrome_service_worker_browsertest.cc

@@ -207,7 +207,7 @@ IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerTest,
   NavigateToPageAndWaitForReadyTitle("/test.html");
 
   GetServiceWorkerContext()->StopAllServiceWorkersForOrigin(
-      embedded_test_server()->base_url());
+      url::Origin::Create(embedded_test_server()->base_url()));
   HostContentSettingsMapFactory::GetForProfile(browser()->profile())
       ->SetDefaultContentSetting(ContentSettingsType::JAVASCRIPT,
                                  CONTENT_SETTING_BLOCK);
@@ -632,7 +632,7 @@ IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerNavigationHintTest, Started) {
   InitializeServer();
   NavigateToPageAndWaitForReadyTitle("/test.html");
   GetServiceWorkerContext()->StopAllServiceWorkersForOrigin(
-      embedded_test_server()->base_url());
+      url::Origin::Create(embedded_test_server()->base_url()));
   RunNavigationHintTest(
       "/scope/", content::StartServiceWorkerForNavigationHintResult::STARTED,
       true);
@@ -687,7 +687,7 @@ IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerNavigationHintTest, NoFetchHandler) {
   InitializeServer();
   NavigateToPageAndWaitForReadyTitle("/test.html");
   GetServiceWorkerContext()->StopAllServiceWorkersForOrigin(
-      embedded_test_server()->base_url());
+      url::Origin::Create(embedded_test_server()->base_url()));
   RunNavigationHintTest(
       "/scope/",
       content::StartServiceWorkerForNavigationHintResult::NO_FETCH_HANDLER,

chrome/browser/task_manager/providers/worker_task_provider_browsertest.cc

@@ -191,7 +191,7 @@ IN_PROC_BROWSER_TEST_F(WorkerTaskProviderBrowserTest,
       base::CompareCase::INSENSITIVE_ASCII));
 
   GetServiceWorkerContext(browser())->StopAllServiceWorkersForOrigin(
-      embedded_test_server()->base_url());
+      url::Origin::Create(embedded_test_server()->base_url()));
   WaitUntilTaskCount(0);
 
   StopUpdating();
@@ -228,7 +228,7 @@ IN_PROC_BROWSER_TEST_F(WorkerTaskProviderBrowserTest,
       base::CompareCase::INSENSITIVE_ASCII));
 
   GetServiceWorkerContext(incognito)->StopAllServiceWorkersForOrigin(
-      embedded_test_server()->base_url());
+      url::Origin::Create(embedded_test_server()->base_url()));
   WaitUntilTaskCount(0);
 
   StopUpdating();
@@ -281,12 +281,12 @@ IN_PROC_BROWSER_TEST_F(WorkerTaskProviderBrowserTest,
       base::CompareCase::INSENSITIVE_ASCII));
 
   GetServiceWorkerContext(browser_1)->StopAllServiceWorkersForOrigin(
-      embedded_test_server()->base_url());
+      url::Origin::Create(embedded_test_server()->base_url()));
   WaitUntilTaskCount(1);
   EXPECT_EQ(task_2, tasks()[0]);
 
   GetServiceWorkerContext(browser_2)->StopAllServiceWorkersForOrigin(
-      embedded_test_server()->base_url());
+      url::Origin::Create(embedded_test_server()->base_url()));
   WaitUntilTaskCount(0);
 
   StopUpdating();
@@ -320,7 +320,7 @@ IN_PROC_BROWSER_TEST_F(WorkerTaskProviderBrowserTest, CreateExistingTasks) {
       base::CompareCase::INSENSITIVE_ASCII));
 
   GetServiceWorkerContext(browser())->StopAllServiceWorkersForOrigin(
-      embedded_test_server()->base_url());
+      url::Origin::Create(embedded_test_server()->base_url()));
   WaitUntilTaskCount(0);
 
   StopUpdating();

components/performance_manager/service_worker_context_adapter.cc

@@ -181,7 +181,7 @@ void ServiceWorkerContextAdapter::StartServiceWorkerForNavigationHint(
 }
 
 void ServiceWorkerContextAdapter::StopAllServiceWorkersForOrigin(
-    const GURL& origin) {
+    const url::Origin& origin) {
   NOTIMPLEMENTED();
 }
 

components/performance_manager/service_worker_context_adapter.h

@@ -84,7 +84,7 @@ class ServiceWorkerContextAdapter
   void StartServiceWorkerForNavigationHint(
       const GURL& document_url,
       StartServiceWorkerForNavigationHintCallback callback) override;
-  void StopAllServiceWorkersForOrigin(const GURL& origin) override;
+  void StopAllServiceWorkersForOrigin(const url::Origin& origin) override;
   void StopAllServiceWorkers(base::OnceClosure callback) override;
   const base::flat_map<int64_t /* version_id */,
                        content::ServiceWorkerRunningInfo>&

content/browser/service_worker/service_worker_context_unittest.cc

@@ -560,7 +560,7 @@ TEST_F(ServiceWorkerContextTest, OnVersionRunningStatusChangedObserver) {
       base::BindOnce(&RegisteredCallback, run_loop.QuitClosure()));
   run_loop.Run();
 
-  context_wrapper()->StopAllServiceWorkersForOrigin(scope);
+  context_wrapper()->StopAllServiceWorkersForOrigin(url::Origin::Create(scope));
   base::RunLoop().RunUntilIdle();
 
   std::vector<TestServiceWorkerContextObserver::EventLog> events;

content/browser/service_worker/service_worker_context_wrapper.cc

@@ -884,7 +884,7 @@ void ServiceWorkerContextWrapper::StartServiceWorkerForNavigationHint(
 }
 
 void ServiceWorkerContextWrapper::StopAllServiceWorkersForOrigin(
-    const GURL& origin) {
+    const url::Origin& origin) {
   if (!BrowserThread::CurrentlyOn(GetCoreThreadId())) {
     base::PostTask(
         FROM_HERE, {GetCoreThreadId()},
@@ -899,7 +899,7 @@ void ServiceWorkerContextWrapper::StopAllServiceWorkersForOrigin(
   std::vector<ServiceWorkerVersionInfo> live_versions = GetAllLiveVersionInfo();
   for (const ServiceWorkerVersionInfo& info : live_versions) {
     ServiceWorkerVersion* version = GetLiveVersion(info.version_id);
-    if (version && version->scope().GetOrigin() == origin)
+    if (version && version->origin() == origin)
       version->StopWorker(base::DoNothing());
   }
 }

content/browser/service_worker/service_worker_context_wrapper.h

@@ -197,7 +197,7 @@ class CONTENT_EXPORT ServiceWorkerContextWrapper
   void StartServiceWorkerForNavigationHint(
       const GURL& document_url,
       StartServiceWorkerForNavigationHintCallback callback) override;
-  void StopAllServiceWorkersForOrigin(const GURL& origin) override;
+  void StopAllServiceWorkersForOrigin(const url::Origin& origin) override;
   void StopAllServiceWorkers(base::OnceClosure callback) override;
   const base::flat_map<int64_t, ServiceWorkerRunningInfo>&
   GetRunningServiceWorkerInfos() override;

content/public/browser/service_worker_context.h

@@ -261,7 +261,7 @@ class CONTENT_EXPORT ServiceWorkerContext {
   // Stops all running workers on the given |origin|.
   //
   // This function can be called from any thread.
-  virtual void StopAllServiceWorkersForOrigin(const GURL& origin) = 0;
+  virtual void StopAllServiceWorkersForOrigin(const url::Origin& origin) = 0;
 
   // Stops all running service workers.
   //

content/public/test/fake_service_worker_context.cc

@@ -111,7 +111,7 @@ void FakeServiceWorkerContext::StartServiceWorkerAndDispatchMessage(
 }
 
 void FakeServiceWorkerContext::StopAllServiceWorkersForOrigin(
-    const GURL& origin) {
+    const url::Origin& origin) {
   stop_all_service_workers_for_origin_calls_.push_back(origin);
 }
 

content/public/test/fake_service_worker_context.h

@@ -74,7 +74,7 @@ class FakeServiceWorkerContext : public ServiceWorkerContext {
   void StartServiceWorkerForNavigationHint(
       const GURL& document_url,
       StartServiceWorkerForNavigationHintCallback callback) override;
-  void StopAllServiceWorkersForOrigin(const GURL& origin) override;
+  void StopAllServiceWorkersForOrigin(const url::Origin& origin) override;
   void StopAllServiceWorkers(base::OnceClosure callback) override;
   const base::flat_map<int64_t, ServiceWorkerRunningInfo>&
   GetRunningServiceWorkerInfos() override;
@@ -101,7 +101,7 @@ class FakeServiceWorkerContext : public ServiceWorkerContext {
     return start_service_worker_and_dispatch_long_running_message_calls_;
   }
 
-  const std::vector<GURL>& stop_all_service_workers_for_origin_calls() {
+  const std::vector<url::Origin>& stop_all_service_workers_for_origin_calls() {
     return stop_all_service_workers_for_origin_calls_;
   }
 
@@ -114,7 +114,7 @@ class FakeServiceWorkerContext : public ServiceWorkerContext {
   std::vector<StartServiceWorkerAndDispatchMessageArgs>
       start_service_worker_and_dispatch_long_running_message_calls_;
 
-  std::vector<GURL> stop_all_service_workers_for_origin_calls_;
+  std::vector<url::Origin> stop_all_service_workers_for_origin_calls_;
 
   base::ObserverList<ServiceWorkerContextObserver, true>::Unchecked observers_;
 

extensions/browser/service_worker_manager.cc

@@ -27,7 +27,7 @@ void ServiceWorkerManager::OnExtensionUnloaded(
     UnloadedExtensionReason reason) {
   util::GetStoragePartitionForExtensionId(extension->id(), browser_context_)
       ->GetServiceWorkerContext()
-      ->StopAllServiceWorkersForOrigin(extension->url());
+      ->StopAllServiceWorkersForOrigin(extension->origin());
 }
 
 void ServiceWorkerManager::OnExtensionUninstalled(
@@ -40,8 +40,7 @@ void ServiceWorkerManager::OnExtensionUninstalled(
   // c) Check for any orphaned workers.
   util::GetStoragePartitionForExtensionId(extension->id(), browser_context_)
       ->GetServiceWorkerContext()
-      ->DeleteForOrigin(url::Origin::Create(extension->url()),
-                        base::DoNothing());
+      ->DeleteForOrigin(extension->origin(), base::DoNothing());
 }
 
 }  // namespace extensions

extensions/common/extension.h

@@ -25,6 +25,7 @@
 #include "extensions/common/manifest.h"
 #include "extensions/common/url_pattern_set.h"
 #include "url/gurl.h"
+#include "url/origin.h"
 
 #if !BUILDFLAG(ENABLE_EXTENSIONS)
 #error "Extensions must be enabled"
@@ -257,6 +258,7 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
 
   const base::FilePath& path() const { return path_; }
   const GURL& url() const { return extension_url_; }
+  url::Origin origin() const { return url::Origin::Create(extension_url_); }
   Manifest::Location location() const;
   const ExtensionId& id() const;
   const HashedExtensionId& hashed_id() const;