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..7aa6e4cb834a45d64fe790a5974817c1ce712b47 100644
--- a/content/common/navigation_params.h
+++ b/content/common/navigation_params.h
@@ -11,8 +11,11 @@
 #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"
 
@@ -46,7 +49,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);
   ~CommonNavigationParams();
 
   // The URL to navigate to.
@@ -89,6 +93,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 +115,10 @@ 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,
+                        RequestContextFrameType frame_type);
 
   // The request method: GET, POST, etc.
   std::string method;
@@ -120,6 +131,14 @@ 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;

[carlosk, 2015/08/27 14:26:43]

If we REALLY want to avoid adding more data fields here we could try to
eliminate skip_service_worker by overloading request_context_type with its
meaning: if it is set to REQUEST_CONTEXT_TYPE_UNSPECIFIED we could assume
skip_service_worker is true (if that value is not normally used).

To make this a little less cryptic we should also rename request_context_type to
something like request_context_type_for_service_worker so that the connection is
made clearer.

But I'm not sure this is possible nor if it will be too confusing.

[clamy, 2015/08/27 15:19:03]

Request context type is an enum part of the public content API. We should nto be
modifying it. On top of that, I think it may be codified by various specs.

[Fabrice (no longer in Chrome), 2015/08/28 15:40:16]

That's not possible. ServiceWorker has its own, sometimes complex, logic when it
comes to setting skip_service_worker to true.

+
+  // Indicates if the current request is the main frame load, a sub-frame
+  // load, or a sub objects load.

[clamy, 2015/08/27 11:53:45]

Is this really needed? You already know if you are loading a main frame or a
subframe on the browser side (and you _should not_ trust the information from
the renderer if you have it on the browser side). It seems weird that a sub
object load results in a navigation. Does it happen in practice? If it does,
this seems to me to be a bug taht we should fix.

[Fabrice (no longer in Chrome), 2015/08/28 15:40:16]

I removed the frame type.

+  RequestContextType request_context_type;
+  RequestContextFrameType frame_type;
 };
 
 // Provided by the browser -----------------------------------------------------