PlzNavigate: Make ServiceWorker work with PlzNavigate.

content/browser/loader/navigation_url_loader_impl_core.cc

Index: content/browser/loader/navigation_url_loader_impl_core.cc
diff --git a/content/browser/loader/navigation_url_loader_impl_core.cc b/content/browser/loader/navigation_url_loader_impl_core.cc
index 7cbf6999946551028e17f588a2d5277e81119cff..9d635e876e6e28e9eb23c2bffb0bab4d3367c96e 100644
--- a/content/browser/loader/navigation_url_loader_impl_core.cc
+++ b/content/browser/loader/navigation_url_loader_impl_core.cc
@@ -10,7 +10,9 @@
 #include "content/browser/frame_host/navigation_request_info.h"
 #include "content/browser/loader/navigation_resource_handler.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
+#include "content/browser/service_worker/service_worker_context_wrapper.h"
 #include "content/common/navigation_params.h"
+#include "content/common/service_worker/service_worker_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/stream_handle.h"
 #include "content/public/common/resource_response.h"
@@ -20,8 +22,11 @@
 namespace content {
 
 NavigationURLLoaderImplCore::NavigationURLLoaderImplCore(
-    const base::WeakPtr<NavigationURLLoaderImpl>& loader)
+    const base::WeakPtr<NavigationURLLoaderImpl>& loader,
+    ServiceWorkerContext* service_worker_context)
     : loader_(loader),
+      service_worker_context_(
+          static_cast<ServiceWorkerContextWrapper*>(service_worker_context)),
       resource_handler_(nullptr) {
   // This object is created on the UI thread but otherwise is accessed and
   // deleted on the IO thread.
@@ -47,8 +52,8 @@ void NavigationURLLoaderImplCore::Start(
                  base::TimeTicks::Now()));
 
   ResourceDispatcherHostImpl::Get()->BeginNavigationRequest(
-      resource_context, frame_tree_node_id,
-      *request_info, this);
+      resource_context, frame_tree_node_id, *request_info, this,
+      service_worker_context_.get());
 }
 
 void NavigationURLLoaderImplCore::FollowRedirect() {
@@ -58,6 +63,11 @@ void NavigationURLLoaderImplCore::FollowRedirect() {
     resource_handler_->FollowRedirect();
 }
 
+void NavigationURLLoaderImplCore::SetServiceWorkerProviderHost(
+    scoped_ptr<ServiceWorkerProviderHost> service_worker_provider_host) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  service_worker_provider_host_ = service_worker_provider_host.Pass();
+}
 
 void NavigationURLLoaderImplCore::NotifyRequestRedirected(
     const net::RedirectInfo& redirect_info,
@@ -80,6 +90,11 @@ void NavigationURLLoaderImplCore::NotifyResponseStarted(
     scoped_ptr<StreamHandle> body) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
+  if (service_worker_provider_host_) {
+    service_worker_context_->RegisterBrowserProviderHost(

[michaeln, 2015/09/01 01:15:23]

If anything should prevent context->TakeBrowserProviderHost() from eventually
being called, the provider host will be leaked. The comment below about timing
related to UI thread task processing suggests that some things could prevent the
Take method from happening?

[Fabrice (no longer in Chrome), 2015/09/07 12:09:48]

Acknowledged.

+        service_worker_provider_host_.Pass());
+  }
+
   // If, by the time the task reaches the UI thread, |loader_| has already been
   // destroyed, NotifyResponseStarted will not run. |body| will be destructed
   // and the request released at that point.