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..998a4089e4b4fc15a16d003e4551951d22fb1ab8 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 ServiceWorkerProviderHost;
 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,11 @@ class NavigationURLLoaderImplCore {
     resource_handler_ = resource_handler;
   }
 
+  ServiceWorkerProviderHost* service_worker_provider_host() {
+    return service_worker_provider_host_.get();
+  }
+  void SetServiceWorkerProviderHost(scoped_ptr<ServiceWorkerProviderHost>);

[carlosk, 2015/08/27 14:26:42]

nit: new line here.

[Fabrice (no longer in Chrome), 2015/08/28 15:40:15]

Spacing between getters and setters in headers is so inconsistent across the
code base, I am not sure what is the expected way to do it.

+
   // Notifies |loader_| on the UI thread that the request was redirected.
   void NotifyRequestRedirected(const net::RedirectInfo& redirect_info,
                                ResourceResponse* response);
@@ -63,7 +72,9 @@ class NavigationURLLoaderImplCore {
 
  private:
   base::WeakPtr<NavigationURLLoaderImpl> loader_;
+  scoped_refptr<ServiceWorkerContextWrapper> service_worker_context_;
   NavigationResourceHandler* resource_handler_;
+  scoped_ptr<ServiceWorkerProviderHost> service_worker_provider_host_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationURLLoaderImplCore);
 };