Prerender: Confirm ServiceWorkers are invoked for NoState Prefetch

content/browser/service_worker/service_worker_context_wrapper.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 83 matching lines @@
     case blink::WebNavigationHintType::LinkTapUnconfirmed:
       return ServiceWorkerMetrics::EventType::
           NAVIGATION_HINT_LINK_TAP_UNCONFIRMED;
     case blink::WebNavigationHintType::LinkTapDown:
       return ServiceWorkerMetrics::EventType::NAVIGATION_HINT_LINK_TAP_DOWN;
   }
   NOTREACHED() << "Unexpected navigation hint" << static_cast<int>(type);
   return ServiceWorkerMetrics::EventType::UNKNOWN;
 }
 
+void Noop() {}
+
+void StatusCallbackRunner(const base::Closure& callback,
+                          ServiceWorkerStatusCode status) {
+  callback.Run();
+}
+
 }  // namespace
 
 void ServiceWorkerContext::AddExcludedHeadersForFetchEvent(
     const std::set<std::string>& header_names) {
   // TODO(pkasting): Remove ScopedTracker below once crbug.com/477117 is fixed.
   tracked_objects::ScopedTracker tracking_profile(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "477117 ServiceWorkerContext::AddExcludedHeadersForFetchEvent"));
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   g_excluded_header_name_set.Get().insert(header_names.begin(),
@@ skipping 369 matching lines @@
     const CheckHasServiceWorkerCallback& callback,
     bool has_service_worker) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                           base::Bind(callback, has_service_worker));
 }
 
 void ServiceWorkerContextWrapper::StopAllServiceWorkersForOrigin(
     const GURL& origin) {
+  StopAllServiceWorkersForOriginWithCallback(origin, base::Bind(&Noop));

[pasko, 2017/01/02 18:15:36]

base::DoNothing

[mattcary, 2017/01/03 09:00:03]

Ah, thanks, I was looking in callback_helpers.h, silly me.

+}
+
+void ServiceWorkerContextWrapper::StopAllServiceWorkersForOriginWithCallback(
+    const GURL& origin,
+    const base::Closure& callback) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
-        base::Bind(&ServiceWorkerContextWrapper::StopAllServiceWorkersForOrigin,
-                   this, origin));
+        base::Bind(&ServiceWorkerContextWrapper::
+                       StopAllServiceWorkersForOriginWithCallback,
+                   this, origin, callback));
     return;
   }
   if (!context_core_.get()) {
     return;
   }
   std::vector<ServiceWorkerVersionInfo> live_versions = GetAllLiveVersionInfo();
   for (const ServiceWorkerVersionInfo& info : live_versions) {
     ServiceWorkerVersion* version = GetLiveVersion(info.version_id);
     if (version && version->scope().GetOrigin() == origin)
-      version->StopWorker(base::Bind(&ServiceWorkerUtils::NoOpStatusCallback));
+      version->StopWorker(base::Bind(&StatusCallbackRunner, callback));
   }
 }
 
 void ServiceWorkerContextWrapper::DidFindRegistrationForUpdate(
     ServiceWorkerStatusCode status,
     scoped_refptr<ServiceWorkerRegistration> registration) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   if (status != SERVICE_WORKER_OK)
     return;
@@ skipping 390 matching lines @@
   observer_list_->Notify(FROM_HERE,
                          &ServiceWorkerContextObserver::OnStorageWiped);
 }
 
 ServiceWorkerContextCore* ServiceWorkerContextWrapper::context() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   return context_core_.get();
 }
 
 }  // namespace content