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
   // network stack.
   // TODO(clamy): same document navigations should not send requests to the
   // network stack. Neither should pushState/popState.
   return !url.SchemeIs(url::kDataScheme) && url != GURL(url::kAboutBlankURL) &&
          !url.SchemeIs(url::kJavaScriptScheme);
 }
 
 CommonNavigationParams::CommonNavigationParams()
     : transition(ui::PAGE_TRANSITION_LINK),
       navigation_type(FrameMsg_Navigate_Type::NORMAL),
       allow_download(true),
       should_replace_current_entry(false),
-      report_type(FrameMsg_UILoadMetricsReportType::NO_REPORT) {
+      report_type(FrameMsg_UILoadMetricsReportType::NO_REPORT),
+      service_worker_provider_id(kInvalidServiceWorkerProviderId) {
 }
 
 CommonNavigationParams::CommonNavigationParams(
     const GURL& url,
     const Referrer& referrer,
     ui::PageTransition transition,
     FrameMsg_Navigate_Type::Value navigation_type,
     bool allow_download,
     bool should_replace_current_entry,
     base::TimeTicks ui_timestamp,
     FrameMsg_UILoadMetricsReportType::Value report_type,
     const GURL& base_url_for_data_url,
-    const GURL& history_url_for_data_url)
+    const GURL& history_url_for_data_url,
+    int service_worker_provider_id)
     : url(url),
       referrer(referrer),
       transition(transition),
       navigation_type(navigation_type),
       allow_download(allow_download),
       should_replace_current_entry(should_replace_current_entry),
       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) {
+      history_url_for_data_url(history_url_for_data_url),
+      service_worker_provider_id(service_worker_provider_id) {
 }
 
 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_LOCATION),
+      frame_type(REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL) {
 }
 
-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,
+    RequestContextFrameType frame_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),
+      frame_type(frame_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 78 matching lines @@
     const RequestNavigationParams& request_params)
     : common_params(common_params),
       start_params(start_params),
       request_params(request_params) {
 }
 
 NavigationParams::~NavigationParams() {
 }
 
 }  // namespace content