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/ref_counted.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 ServiceWorkerContextWrapper;
 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).
@@ skipping 17 matching lines @@
 // 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.
 //
 // 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,
-                                                 bool is_main_frame,
-                                                 NavigatorDelegate* delegate);
+  static scoped_ptr<NavigationHandleImpl>
+  Create(const GURL& url, bool is_main_frame, FrameTreeNode* frame_tree_node);
   ~NavigationHandleImpl() override;
 
   // NavigationHandle implementation:
   const GURL& GetURL() override;
   bool IsInMainFrame() override;
   bool IsPost() override;
   const Referrer& GetReferrer() override;
   bool HasUserGesture() override;
   ui::PageTransition GetPageTransition() override;
   bool IsExternalProtocol() override;
@@ skipping 24 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
+  void set_service_worker_provider_id(int service_worker_provider_id) {
+    service_worker_provider_id_ = service_worker_provider_id;
+  }
+
   // 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 20 matching lines @@
   // Used to track the state the navigation is currently in.
   enum State {
     INITIAL = 0,
     WILL_SEND_REQUEST,
     READY_TO_COMMIT,
     DID_COMMIT,
     DID_COMMIT_ERROR_PAGE,
   };
 
   NavigationHandleImpl(const GURL& url,
-                       const bool is_main_frame,

[nasko, 2015/10/02 22:09:45]

Why did we lose the const here?

[Fabrice (no longer in Chrome), 2015/10/06 17:21:37]

It was inconsistent. This has been removed in the other patch anyway.

-                       NavigatorDelegate* delegate);
+                       bool is_main_frame,
+                       FrameTreeNode* frame_tree_node);
 
   // See NavigationHandle for a description of those member variables.
   GURL url_;
   const bool is_main_frame_;
   bool is_post_;
   Referrer sanitized_referrer_;
   bool has_user_gesture_;
   ui::PageTransition transition_;
   bool is_external_protocol_;
   net::Error net_error_code_;
   RenderFrameHostImpl* render_frame_host_;
   bool is_same_page_;
 
   // The state the navigation is in.
   State state_;
 
   // 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 delegate that should be notified about events related to this
   // navigation.
   NavigatorDelegate* delegate_;
 
   // A list of Throttles registered for this navigation.
   ScopedVector<NavigationThrottle> throttles_;
 
+  // PlzNavigate
+  // The ServiceWorkerProviderHost ID used for navigations.
+  // Set to kInvalidServiceWorkerProviderId for sandboxed frames and sync loads.
+  // This is unused for current navigation.

[clamy, 2015/10/05 12:18:16]

nit: rephrase as "This parameter is not used in the current navigation
architecture, where it will always be kInvalidServiceWorkerProviderId."

[Fabrice (no longer in Chrome), 2015/10/06 17:21:37]

Done.

+  int service_worker_provider_id_;
+
+  scoped_refptr<ServiceWorkerContextWrapper> service_worker_context_;

[nasko, 2015/10/02 22:09:45]

Can you add a comment on this member?

[clamy, 2015/10/05 12:18:16]

I'd rather you store the FrameTreeNode (see comments in the other patchset). We
will need to store it anyway, since we eventually want to expose its id to the
WebNavigationAPI. This way, you don't have to store this member, since you can
get the BrowserContext at anytime.

[Fabrice (no longer in Chrome), 2015/10/06 17:21:37]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(NavigationHandleImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_