PlzNavigate: Make ServiceWorker work with PlzNavigate.

content/browser/frame_host/navigation_handle_impl.h

Index: content/browser/frame_host/navigation_handle_impl.h
diff --git a/content/browser/frame_host/navigation_handle_impl.h b/content/browser/frame_host/navigation_handle_impl.h
index 0fdb07d979809f193078c8b1901755d17646ab60..aa64ac001d45d72d9f019f5350b067bcfe6c2bab 100644
--- a/content/browser/frame_host/navigation_handle_impl.h
+++ b/content/browser/frame_host/navigation_handle_impl.h
@@ -18,6 +18,7 @@
 namespace content {
 
 class NavigatorDelegate;
+class ServiceWorkerNavigationHandle;
 struct NavigationRequestInfo;
 
 // This class keeps track of a single navigation. It is created upon receipt of
@@ -102,6 +103,11 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
     is_transferring_ = is_transferring;
   }
 
+  // PlzNavigate
+  ServiceWorkerNavigationHandle* service_worker_handle() const {
+    return service_worker_handle_.get();
+  }
+
   // Called when the URLRequest will start in the network stack.
   NavigationThrottle::ThrottleCheckResult WillStartRequest(
       bool is_post,
@@ -168,6 +174,11 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
   // A list of Throttles registered for this navigation.
   ScopedVector<NavigationThrottle> throttles_;
 
+  // PlzNavigate
+  // Manages the lifetime of a pre-created ServiceWorkerProviderHost until a
+  // corresponding ServiceWorkerNetworkProvider is created in the renderer.

[michaeln, 2015/10/21 20:07:28]

Maybe include in the doc comment that this needs to survive until the renderer
commits the navigation.

+  scoped_ptr<ServiceWorkerNavigationHandle> service_worker_handle_;
+
   DISALLOW_COPY_AND_ASSIGN(NavigationHandleImpl);
 };