PlzNavigate: Make ServiceWorker work with PlzNavigate.

content/common/navigation_params.h

Index: content/common/navigation_params.h
diff --git a/content/common/navigation_params.h b/content/common/navigation_params.h
index 37b1af035401ee8e9ab394831888b68c6519e4e9..74b16e4aabb14d61221a95056a05c6d2091dc47a 100644
--- a/content/common/navigation_params.h
+++ b/content/common/navigation_params.h
@@ -13,6 +13,7 @@
 #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"
 
@@ -46,7 +47,8 @@ struct CONTENT_EXPORT CommonNavigationParams {
                          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]

I still think it could be conceptually cleaner and useful for this value to be
coined as a unique "navigation_id" rather than a sw specific value. That way the
sw and appcache systems can each derive a unique <foo>HostIds based on this
value. As a practical terms, its hardly a difference, mostly just a matter what
body of code owns the static sequence generator.

[carlosk, 2015/09/01 09:27:46]

I also like this idea as a unique navigation id will be useful in other places
as well. Now that we have the NavigationHandle in place this should be a simple
addition. 

I don't expect this to make this change more complex than it already is and
avoiding conflicts of this id value with the renderer generated provider ids
should be simple enough.

[Fabrice (no longer in Chrome), 2015/09/07 12:09:48]

This struct is used both ways, this argument has a slightly different meaning
depending on where the navigation was initiated.
For a browser-initiated navigation, this refers to the value with which the
dummy SWPH was initialized.
For a renderer-initiated navigation, this refers to the SWPH that is supposed to
handle the request. So, unless we create a new SWNP/SWPH couple for every
navigation, that is not going to work.
Even that approach has issues, since navigation_id would need to be created
browser-side and we would need a mechanism to have a temporary id-less SWNP for
renderer-initiated navigations.

However, this still sounds like a good idea and it would work really well with
PlzNavigate. But I think it would lead to a lot of code complexity to implement
a dual ID system as it is (one for current navigation, one for PlzNavigate).
Maybe we could revisit once we have fully switched to PlzNavigate?

[michaeln, 2015/09/16 00:56:41]

I see the browser-initiated stuff at the callsite to SWPH::GetNextXXXX().
Why does the browser-side nav logic have to know of the id in this case? I see
the provider_id being set in MakeCommonNavigationParams in the renderer, but
don't follow what happens thereafter and why that value is needed?
Would it make sense to coin a "browser_initiated_nav_id" only for browser
initiated navs?

   ~CommonNavigationParams();
 
   // The URL to navigate to.
@@ -89,6 +91,10 @@ struct CONTENT_EXPORT CommonNavigationParams {
   // 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 ----------------------------------------------------
@@ -107,7 +113,9 @@ struct CONTENT_EXPORT 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;
@@ -120,6 +128,12 @@ struct CONTENT_EXPORT BeginNavigationParams {
 
   // 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 -----------------------------------------------------