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/common/service_worker/service_worker_types.h"
 #include "content/public/common/page_state.h"
 #include "content/public/common/referrer.h"
+#include "content/public/common/request_context_frame_type.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 13 matching lines @@
   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);

[michaeln, 2015/09/01 01:15:23]

browser_initiated_nav_id

   ~CommonNavigationParams();
 
   // The URL to navigate to.
   // PlzNavigate: May be modified when the navigation is ready to commit.
   GURL url;
 
   // The URL to send in the "Referer" header field. Can be empty if there is
   // no referrer.
   Referrer referrer;
 
@@ skipping 22 matching lines @@
   // The report type to be used when recording the metric using |ui_timestamp|.
   FrameMsg_UILoadMetricsReportType::Value report_type;
 
   // Base URL for use in Blink's SubstituteData.
   // Is only used with data: URLs.
   GURL base_url_for_data_url;
 
   // History URL for use in Blink's SubstituteData.
   // Is only used with data: URLs.
   GURL history_url_for_data_url;
+
+  // PlzNavigate
+  // The ServiceWorker provider ID associated with the navigation.
+  int service_worker_provider_id;
 };
 
 // Provided by the renderer ----------------------------------------------------
 //
 // This struct holds parameters sent by the renderer to the browser. It is only
 // used in PlzNavigate (since in the current architecture, the renderer does not
 // inform the browser of navigations until they commit).
 
 // 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,
+                        FetchRequestMode fetch_request_mode,

[nasko, 2015/08/20 16:49:50]

Can we skip adding some of these? For example, FetchRequestMode doesn't really
make sense in the case of navigation requests. This aren't fetch() calls. Same
with the credentials mode and redirect mode.

[Fabrice (no longer in Chrome), 2015/08/26 13:23:24]

I removed them and DCHEK'd them per clamy's suggestion.

+                        FetchCredentialsMode fetch_credentials_mode,
+                        FetchRedirectMode fetch_redirect_mode,
+                        RequestContextType request_context_type,

[nasko, 2015/08/20 16:49:50]

This one can also be only one of two values, right? Looking through the enum,
only _FRAME and _IFRAME make sense. 

[Fabrice (no longer in Chrome), 2015/08/26 13:23:24]

I did some quick and dirty testing, these are the values I managed to get:
REQUEST_CONTEXT_TYPE_FORM
REQUEST_CONTEXT_TYPE_HYPERLINK
REQUEST_CONTEXT_TYPE_LOCATION

+                        RequestContextFrameType frame_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.

[clamy, 2015/08/24 12:27:35]

In which cases is skip_service_worker set to true?

[Fabrice (no longer in Chrome), 2015/08/26 13:23:24]

There are a few cases:
-The request was fallbacked through the network, it should not be sent to the
ServiceWorker again.
-NPAPI does not use ServiceWorker (though that is going away soon)
-It is also set to true in Blink in many places. I'm not sure what they all
correspond to. I think some are for reload requests, while others are for
fallbacks. kinuko@, can you confirm these are the only use cases? Also, what
kind of reloads should trigger skipping the ServiceWorker?

[kinuko, 2015/08/27 01:37:44]

I think your understanding is correct. Fallback handling needs to go back and
forth between processes in some cases (e.g. redirect, CORS fallback etc) and
that's making the current flag handling code less understandable.  (We're
willing to cleanup these)

+  bool skip_service_worker;
+
+  // The request mode passed to the ServiceWorker.
+  FetchRequestMode fetch_request_mode;
+
+  // The credentials mode passed to the ServiceWorker.
+  FetchCredentialsMode fetch_credentials_mode;
+
+  // The redirect mode used in Fetch API.
+  FetchRedirectMode fetch_redirect_mode;
+
+  // Indicates if the current request is the main frame load, a sub-frame
+  // load, or a sub objects load.
+  RequestContextType request_context_type;
+  RequestContextFrameType frame_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 135 matching lines @@
   ~NavigationParams();
 
   CommonNavigationParams common_params;
   StartNavigationParams start_params;
   RequestNavigationParams request_params;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_NAVIGATION_PARAMS_H_