PlzNavigate: Make ServiceWorker work with PlzNavigate.

content/browser/service_worker/service_worker_request_handler.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_REQUEST_HANDLER_H_
 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_REQUEST_HANDLER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/weak_ptr.h"
 #include "base/supports_user_data.h"
@@ skipping 13 matching lines @@
 }
 
 namespace storage {
 class BlobStorageContext;
 }
 
 namespace content {
 
 class ResourceContext;
 class ResourceRequestBody;
+class NavigationURLLoaderImplCore;
 class ServiceWorkerContextCore;
 class ServiceWorkerContextWrapper;
 class ServiceWorkerProviderHost;
 struct ResourceResponseInfo;
 
 // Abstract base class for routing network requests to ServiceWorkers.
 // Created one per URLRequest and attached to each request.
 class CONTENT_EXPORT ServiceWorkerRequestHandler
     : public base::SupportsUserData::Data {
  public:
   // Attaches a newly created handler if the given |request| needs to
   // be handled by ServiceWorker.
   // TODO(kinuko): While utilizing UserData to attach data to URLRequest
   // has some precedence, it might be better to attach this handler in a more
   // explicit way within content layer, e.g. have ResourceRequestInfoImpl
   // own it.
   static void InitializeHandler(
       net::URLRequest* request,
       ServiceWorkerContextWrapper* context_wrapper,
       storage::BlobStorageContext* blob_storage_context,
       int process_id,
       int provider_id,
       bool skip_service_worker,
       FetchRequestMode request_mode,
       FetchCredentialsMode credentials_mode,
       FetchRedirectMode redirect_mode,
       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.
   static ServiceWorkerRequestHandler* GetHandler(
       net::URLRequest* request);
 
   // Creates a protocol interceptor for ServiceWorker.
   static scoped_ptr<net::URLRequestInterceptor> CreateInterceptor(
       ResourceContext* resource_context);
 
@@ skipping 14 matching lines @@
   virtual void GetExtraResponseInfo(
       ResourceResponseInfo* response_info) const = 0;
 
   // Methods to support cross site navigations.
   void PrepareForCrossSiteTransfer(int old_process_id);
   void CompleteCrossSiteTransfer(int new_process_id,
                                  int new_provider_id);
   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:
   ServiceWorkerRequestHandler(
       base::WeakPtr<ServiceWorkerContextCore> context,
       base::WeakPtr<ServiceWorkerProviderHost> provider_host,
       base::WeakPtr<storage::BlobStorageContext> blob_storage_context,
       ResourceType resource_type);
 
   base::WeakPtr<ServiceWorkerContextCore> context_;
   base::WeakPtr<ServiceWorkerProviderHost> provider_host_;
   base::WeakPtr<storage::BlobStorageContext> blob_storage_context_;
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerRequestHandler);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_REQUEST_HANDLER_H_