PlzNavigate: Make ServiceWorker work with PlzNavigate.

content/browser/loader/navigation_url_loader_impl_core.h

Index: content/browser/loader/navigation_url_loader_impl_core.h
diff --git a/content/browser/loader/navigation_url_loader_impl_core.h b/content/browser/loader/navigation_url_loader_impl_core.h
index 77f90e31bf31ee4bd50e81e4aa040d6757fdf970..313f848d32e64d268466a4b71e7c91c38c3d6922 100644
--- a/content/browser/loader/navigation_url_loader_impl_core.h
+++ b/content/browser/loader/navigation_url_loader_impl_core.h
@@ -23,6 +23,9 @@ class NavigationResourceHandler;
 class ResourceContext;
 class ResourceHandler;
 class ResourceRequestBody;
+class ServiceWorkerContext;
+class ServiceWorkerContextWrapper;
+class ServiceWorkerRequestHandler;
 class StreamHandle;
 struct ResourceResponse;
 
@@ -35,7 +38,8 @@ class NavigationURLLoaderImplCore {
   // Creates a new NavigationURLLoaderImplCore that forwards signals back to
   // |loader| on the UI thread.
   explicit NavigationURLLoaderImplCore(
-      const base::WeakPtr<NavigationURLLoaderImpl>& loader);
+      const base::WeakPtr<NavigationURLLoaderImpl>& loader,
+      ServiceWorkerContext* service_worker_context);
   ~NavigationURLLoaderImplCore();
 
   // Starts the request.
@@ -50,6 +54,9 @@ class NavigationURLLoaderImplCore {
     resource_handler_ = resource_handler;
   }
 
+  void SetServiceWorkerHandler(
+      ServiceWorkerRequestHandler* service_worker_handler);
+
   // Notifies |loader_| on the UI thread that the request was redirected.
   void NotifyRequestRedirected(const net::RedirectInfo& redirect_info,
                                ResourceResponse* response);
@@ -64,6 +71,8 @@ class NavigationURLLoaderImplCore {
  private:
   base::WeakPtr<NavigationURLLoaderImpl> loader_;
   NavigationResourceHandler* resource_handler_;
+  scoped_refptr<ServiceWorkerContextWrapper> service_worker_context_;
+  ServiceWorkerRequestHandler* service_worker_handler_;

[michaeln, 2015/09/16 00:56:42]

Is this rawptr needed? It can be looked up as needed given the URLRequest ptr. A
NavigationResourceHandler helper method might make sense to connect the dots.

ServiceWorkerRequestHandle*
NavigationResourceHandler::GetServiceWorkerRequestHandler() {
  ServiceWorkerRequestHandle::GetHandler(request());
}

I think that'd help with code grokability compared to a rawptr.

edit: Hmmm... past init time, the loader code may not need to get back to the
handler. See other comments about how this probably isn't needed.

[Fabrice (no longer in Chrome), 2015/09/30 17:32:07]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(NavigationURLLoaderImplCore);
 };