PlzNavigate: Make ServiceWorker work with PlzNavigate.

content/browser/frame_host/navigation_handle_impl.h

 // Copyright 2015 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_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_
 
 #include "content/public/browser/navigation_handle.h"
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/navigation_throttle.h"
 #include "url/gurl.h"
 
 namespace content {
 
 class NavigatorDelegate;
+class ServiceWorkerNavigationHandle;
 struct NavigationRequestInfo;
 
 // This class keeps track of a single navigation. It is created upon receipt of
 // a DidStartProvisionalLoad IPC in a RenderFrameHost. The RenderFrameHost owns
 // the newly created NavigationHandleImpl as long as the navigation is ongoing.
 // The NavigationHandleImpl in the RenderFrameHost will be reset when the
 // navigation stops, that is if one of the following events happen:
 //   - The RenderFrameHost receives a DidStartProvisionalLoad IPC for a new
 //   navigation (see below for special cases where the DidStartProvisionalLoad
 //   message does not indicate the start of a new navigation).
 //   - The RenderFrameHost stops loading.
 //   - The RenderFrameHost receives a DidDropNavigation IPC.
 //
 // When the navigation encounters an error, the DidStartProvisionalLoad marking
 // the start of the load of the error page will not be considered as marking a
 // new navigation. It will not reset the NavigationHandleImpl in the
 // RenderFrameHost.
 //
 // If the navigation needs a cross-site transfer, then the NavigationHandleImpl
 // will briefly be held by the RenderFrameHostManager, until a suitable
 // RenderFrameHost for the navigation has been found. The ownership of the
 // NavigationHandleImpl will then be transferred to the new RenderFrameHost.
 // The DidStartProvisionalLoad received by the new RenderFrameHost for the
 // transferring navigation will not reset the NavigationHandleImpl, as it does
 // not mark the start of a new navigation.
 //
 // PlzNavigate: the NavigationHandleImpl is created just after creating a new
 // NavigationRequest. It is then owned by the NavigationRequest until the
 // navigation is ready to commit. The NavigationHandleImpl ownership is then
 // transferred to the RenderFrameHost in which the navigation will commit.

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

Also extending this comment to describe when it's deleted in the expected case
might be nice.

Is there a test to see is this lifetime guarantee is provided?

 //
 // When PlzNavigate is enabled, the NavigationHandleImpl will never be reset
 // following the receipt of a DidStartProvisionalLoad IPC. There are also no
 // transferring navigations. The other causes of NavigationHandleImpl reset in
 // the RenderFrameHost still apply.
 class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
  public:
   static scoped_ptr<NavigationHandleImpl> Create(
       const GURL& url,
       FrameTreeNode* frame_tree_node);
@@ skipping 34 matching lines @@
 
   // Returns whether the navigation is currently being transferred from one
   // RenderFrameHost to another. In particular, a DidStartProvisionalLoad IPC
   // for the navigation URL, received in the new RenderFrameHost, should not
   // indicate the start of a new navigation in that case.
   bool is_transferring() const { return is_transferring_; }
   void set_is_transferring(bool is_transferring) {
     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,
       const Referrer& sanitized_referrer,
       bool has_user_gesture,
       ui::PageTransition transition,
       bool is_external_protocol);
 
   // Called when the URLRequest will be redirected in the network stack.
   NavigationThrottle::ThrottleCheckResult WillRedirectRequest(
@@ skipping 46 matching lines @@
   // Whether the navigation is in the middle of a transfer. Set to false when
   // the DidStartProvisionalLoad is received from the new renderer.
   bool is_transferring_;
 
   // The FrameTreeNode this navigation is happening in.
   FrameTreeNode* frame_tree_node_;
 
   // 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);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_