PlzNavigate: Make ServiceWorker work with PlzNavigate.

content/browser/service_worker/service_worker_request_handler.h

Index: content/browser/service_worker/service_worker_request_handler.h
diff --git a/content/browser/service_worker/service_worker_request_handler.h b/content/browser/service_worker/service_worker_request_handler.h
index 2c14eb1b862676854d13107880525399a5fdb004..188b9691e01d9fc3022d7a56aaf933dee145ffb3 100644
--- a/content/browser/service_worker/service_worker_request_handler.h
+++ b/content/browser/service_worker/service_worker_request_handler.h
@@ -31,6 +31,7 @@ namespace content {
 
 class ResourceContext;
 class ResourceRequestBody;
+class NavigationURLLoaderImplCore;
 class ServiceWorkerContextCore;
 class ServiceWorkerContextWrapper;
 class ServiceWorkerProviderHost;
@@ -60,7 +61,8 @@ class CONTENT_EXPORT ServiceWorkerRequestHandler
       ResourceType resource_type,
       RequestContextType request_context_type,
       RequestContextFrameType frame_type,
-      scoped_refptr<ResourceRequestBody> body);
+      scoped_refptr<ResourceRequestBody> body,
+      NavigationURLLoaderImplCore* loader);
 
   // Returns the handler attached to |request|. This may return NULL
   // if no handler is attached.
@@ -95,6 +97,13 @@ class CONTENT_EXPORT ServiceWorkerRequestHandler
   void MaybeCompleteCrossSiteTransferInOldProcess(
       int old_process_id);
 
+  // PlzNavigate:
+  // Methods to handle the dummy SWProviderHost created for browser-initiated
+  // navigations.

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

These public methods may not be needed if the xfer can be handled as handwaved
at?

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

Done.

+  scoped_ptr<ServiceWorkerProviderHost> TakeBrowserProviderHost();
+  void SetBrowserProviderHost(
+      scoped_ptr<ServiceWorkerProviderHost> provider_host);
+
   ServiceWorkerContextCore* context() const { return context_.get(); }
 
  protected:
@@ -110,7 +119,10 @@ class CONTENT_EXPORT ServiceWorkerRequestHandler
   ResourceType resource_type_;
 
  private:
-  scoped_ptr<ServiceWorkerProviderHost> host_for_cross_site_transfer_;
+  // This host is used for cross-site transfers.
+  // PlzNavigate:
+  // This host is used for browser-initiated navigations.
+  scoped_ptr<ServiceWorkerProviderHost> temporary_host_;

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

its good to annotate with // PlzNavigate, picking a name that suggest this has
something todo with that would be even better, maybe navigation_host_ ?

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

This has been removed.

   int old_process_id_;
   int old_provider_id_;