Prerender: Confirm ServiceWorkers are invoked for NoState Prefetch

chrome/browser/prerender/prerender_contents.cc

Index: chrome/browser/prerender/prerender_contents.cc
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc
index f7c11cf153070824219bb25c50235ddffe4f808d..758093140784a11b6892c4450c74744141014482 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc
@@ -38,7 +38,9 @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/resource_request_details.h"
+#include "content/public/browser/service_worker_context.h"
 #include "content/public/browser/session_storage_namespace.h"
+#include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/frame_navigate_params.h"
@@ -208,7 +210,8 @@ PrerenderContents::PrerenderContents(
       child_id_(-1),
       route_id_(-1),
       origin_(origin),
-      network_bytes_(0) {
+      network_bytes_(0),
+      weak_factory_(this) {
   DCHECK(prerender_manager);
 }
 
@@ -316,6 +319,34 @@ void PrerenderContents::StartPrerendering(
   prerender_contents_.get()->SetUserAgentOverride(
       prerender_manager_->config().user_agent_override);
 
+  // Start URL load only after checking for a ServiceWorker if we're doing
+  // NoStatePrefetch.
+  if (false && prerender_manager_->IsNoStatePrefetch()) {
+    content::BrowserContext* browser_context =
+        prerender_contents_->GetBrowserContext();
+    content::StoragePartition* storage_partition =
+        content::BrowserContext::GetStoragePartition(
+            Profile::FromBrowserContext(browser_context),
+            prerender_contents_->GetSiteInstance());
+
+    storage_partition->GetServiceWorkerContext()->CheckHasServiceWorker(
+        prerender_url_, prerender_url_,
+        base::Bind(&PrerenderContents::ContinuePrerenderIfNoServiceWorker,
+                   weak_factory_.GetWeakPtr()));
+  } else {
+    // Full prerender doesn't care if we have a service worker, so we continue
+    // the prerender unconditionally.
+    ContinuePrerenderIfNoServiceWorker(false /* has_service_worker, ignored */);
+  }
+}
+
+void PrerenderContents::ContinuePrerenderIfNoServiceWorker(
+    bool has_service_worker) {
+  if (prerender_manager_->IsNoStatePrefetch() && has_service_worker) {
+    this->Destroy(FINAL_STATUS_SERVICE_WORKER);
+    return;
+  }
+
   content::NavigationController::LoadURLParams load_url_params(
       prerender_url_);
   load_url_params.referrer = referrer_;