PlzNavigate: Make ServiceWorker work with PlzNavigate.

content/common/navigation_params.cc

 // 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.
 
 #include "content/common/navigation_params.h"
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted_memory.h"
+#include "content/common/service_worker/service_worker_types.h"
 #include "content/public/common/content_switches.h"
 
 namespace content {
 
 // PlzNavigate
 bool ShouldMakeNetworkRequestForURL(const GURL& url) {
   CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableBrowserSideNavigation));
 
   // Data URLs, Javascript URLs and about:blank should not send a request to the
@@ skipping 32 matching lines @@
       ui_timestamp(ui_timestamp),
       report_type(report_type),
       base_url_for_data_url(base_url_for_data_url),
       history_url_for_data_url(history_url_for_data_url) {
 }
 
 CommonNavigationParams::~CommonNavigationParams() {
 }
 
 BeginNavigationParams::BeginNavigationParams()
-    : load_flags(0), has_user_gesture(false) {
-}
+    : load_flags(0),
+      has_user_gesture(false),
+      skip_service_worker(false),
+      request_context_type(REQUEST_CONTEXT_TYPE_HYPERLINK) {}

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

Did we confirm the current code uses hyperlink or location?

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

Done in the other patch.

 
-BeginNavigationParams::BeginNavigationParams(std::string method,
-                                             std::string headers,
-                                             int load_flags,
-                                             bool has_user_gesture)
+BeginNavigationParams::BeginNavigationParams(
+    std::string method,
+    std::string headers,
+    int load_flags,
+    bool has_user_gesture,
+    bool skip_service_worker,
+    RequestContextType request_context_type)
     : method(method),
       headers(headers),
       load_flags(load_flags),
-      has_user_gesture(has_user_gesture) {
-}
+      has_user_gesture(has_user_gesture),
+      skip_service_worker(skip_service_worker),
+      request_context_type(request_context_type) {}
 
 StartNavigationParams::StartNavigationParams()
     : is_post(false),
 #if defined(OS_ANDROID)
       has_user_gesture(false),
 #endif
       transferred_request_child_id(-1),
       transferred_request_request_id(-1) {
 }
 
@@ skipping 25 matching lines @@
       can_load_local_resources(false),
       request_time(base::Time::Now()),
       page_id(-1),
       nav_entry_id(0),
       is_same_document_history_load(false),
       has_committed_real_load(false),
       intended_as_new_entry(false),
       pending_history_list_offset(-1),
       current_history_list_offset(-1),
       current_history_list_length(0),
-      should_clear_history_list(false) {
-}
+      should_clear_history_list(false),
+      service_worker_provider_id(kInvalidServiceWorkerProviderId) {}
 
 RequestNavigationParams::RequestNavigationParams(
     bool is_overriding_user_agent,
     base::TimeTicks navigation_start,
     const std::vector<GURL>& redirects,
     bool can_load_local_resources,
     base::Time request_time,
     const PageState& page_state,
     int32 page_id,
     int nav_entry_id,
@@ skipping 11 matching lines @@
       request_time(request_time),
       page_state(page_state),
       page_id(page_id),
       nav_entry_id(nav_entry_id),
       is_same_document_history_load(is_same_document_history_load),
       has_committed_real_load(has_committed_real_load),
       intended_as_new_entry(intended_as_new_entry),
       pending_history_list_offset(pending_history_list_offset),
       current_history_list_offset(current_history_list_offset),
       current_history_list_length(current_history_list_length),
-      should_clear_history_list(should_clear_history_list) {
-}
+      should_clear_history_list(should_clear_history_list),
+      service_worker_provider_id(kInvalidServiceWorkerProviderId) {}
 
 RequestNavigationParams::~RequestNavigationParams() {
 }
 
 NavigationParams::NavigationParams(
     const CommonNavigationParams& common_params,
     const StartNavigationParams& start_params,
     const RequestNavigationParams& request_params)
     : common_params(common_params),
       start_params(start_params),
       request_params(request_params) {
 }
 
 NavigationParams::~NavigationParams() {
 }
 
 }  // namespace content