PlzNavigate: Make ServiceWorker work with PlzNavigate.

content/common/navigation_params.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_COMMON_NAVIGATION_PARAMS_H_
 #define CONTENT_COMMON_NAVIGATION_PARAMS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/time/time.h"
 #include "content/common/content_export.h"
 #include "content/common/frame_message_enums.h"
 #include "content/public/common/page_state.h"
 #include "content/public/common/referrer.h"
+#include "content/public/common/request_context_type.h"
 #include "ui/base/page_transition_types.h"
 #include "url/gurl.h"
 
 namespace base {
 class RefCountedMemory;
 }
 
 namespace content {
 
 // PlzNavigate
@@ skipping 74 matching lines @@
 // This struct is not used outside of the PlzNavigate project.
 // PlzNavigate: parameters needed to start a navigation on the IO thread,
 // following a renderer-initiated navigation request.
 struct CONTENT_EXPORT BeginNavigationParams {
   // TODO(clamy): See if it is possible to reuse this in
   // ResourceMsg_Request_Params.
   BeginNavigationParams();
   BeginNavigationParams(std::string method,
                         std::string headers,
                         int load_flags,
-                        bool has_user_gesture);
+                        bool has_user_gesture,
+                        bool skip_service_worker,
+                        RequestContextType request_context_type);
 
   // The request method: GET, POST, etc.
   std::string method;
 
   // Additional HTTP request headers.
   std::string headers;
 
   // net::URLRequest load flags (net::LOAD_NORMAL) by default).
   int load_flags;
 
   // True if the request was user initiated.
   bool has_user_gesture;
+
+  // True if the ServiceWorker should be skipped.
+  bool skip_service_worker;
+
+  // Indicates the request context type.
+  RequestContextType request_context_type;
 };
 
 // Provided by the browser -----------------------------------------------------
 //
 // These structs are sent by the browser to the renderer to start/commit a
 // navigation depending on whether browser-side navigation is enabled.
 // Parameters used both in the current architecture and PlzNavigate should be
 // put in RequestNavigationParams.  Parameters only used by the current
 // architecture should go in StartNavigationParams.
 
@@ skipping 117 matching lines @@
 
   // Where its current page contents reside in session history and the total
   // size of the session history list.
   int current_history_list_offset;
   int current_history_list_length;
 
   // Whether session history should be cleared. In that case, the RenderView
   // needs to notify the browser that the clearing was succesful when the
   // navigation commits.
   bool should_clear_history_list;
+
+  // PlzNavigate
+  // The ServiceWorkerProviderHost ID used for navigations.
+  // Set to kInvalidServiceWorkerProviderId for sandboxed frames and sync loads.
+  // This is unused for current navigation.

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

Can you clarify what is meant by "current"? Is it PlzNavigation code vs existing
navigation code? Or is it current vs pending navigation?

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

+1. Something along the lines of "This parameter is not used in the current
navigation architecture, where it will always be equal to
kInvalidServiceWorkerProviderId." is a bit clearer.

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

Done in the other patch.

+  int service_worker_provider_id;
 };
 
 // Helper struct keeping track in one place of all the parameters the browser
 // needs to provide to the renderer.
 struct NavigationParams {
   NavigationParams(const CommonNavigationParams& common_params,
                    const StartNavigationParams& start_params,
                    const RequestNavigationParams& request_params);
   ~NavigationParams();
 
   CommonNavigationParams common_params;
   StartNavigationParams start_params;
   RequestNavigationParams request_params;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_NAVIGATION_PARAMS_H_