PlzNavigate: Make ServiceWorker work with PlzNavigate.

content/browser/frame_host/navigation_request.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/browser/frame_host/navigation_request.h"
 
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/navigation_handle_impl.h"
 #include "content/browser/frame_host/navigation_request_info.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/browser/loader/navigation_url_loader.h"
+#include "content/browser/service_worker/service_worker_provider_host.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/common/resource_request_body.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/stream_handle.h"
 #include "content/public/common/content_client.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_request_headers.h"
 #include "net/url_request/redirect_info.h"
 
 namespace content {
@@ skipping 54 matching lines @@
   if (entry.GetHasPostData()) {
     request_body = new ResourceRequestBody();
     request_body->AppendBytes(
         reinterpret_cast<const char *>(
             entry.GetBrowserInitiatedPostData()->front()),
         entry.GetBrowserInitiatedPostData()->size());
   }
 
   scoped_ptr<NavigationRequest> navigation_request(new NavigationRequest(
       frame_tree_node,
-      entry.ConstructCommonNavigationParams(dest_url, dest_referrer,
-                                            frame_entry, navigation_type),
-      BeginNavigationParams(method, headers.ToString(),
-                            LoadFlagFromNavigationType(navigation_type), false),
+      entry.ConstructCommonNavigationParams(
+          dest_url, dest_referrer, frame_entry, navigation_type,
+          ServiceWorkerProviderHost::GetNextBrowserProviderID()),
+      BeginNavigationParams(method,
+                            headers.ToString(),
+                            LoadFlagFromNavigationType(navigation_type),
+                            false, // has_user_gestures
+                            false, // skip_service_worker
+                            REQUEST_CONTEXT_TYPE_LOCATION,

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

I'm not sure this is the best context type for a browser-initiated navigation. I
think we've been using LINK for this purpose.

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

If you do this change here remember that there are other places where this same
value was used as default that should be changed as well.

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

I left LOCATION for now, I'd like some more people input since we seemingly use
both types. Maybe we should have a static method somewhere to return a default
for browser-initiated navigations?

+                            frame_tree_node->IsMainFrame() ?
+                                REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL :
+                                REQUEST_CONTEXT_FRAME_TYPE_NESTED),
       entry.ConstructRequestNavigationParams(
           frame_entry, navigation_start, is_same_document_history_load,
           frame_tree_node->has_committed_real_load(),
           controller->GetPendingEntryIndex() == -1,
           controller->GetIndexOfEntry(&entry),
           controller->GetLastCommittedEntryIndex(),
           controller->GetEntryCount()),
       request_body, true, &frame_entry, &entry));
   return navigation_request.Pass();
 }
@@ skipping 135 matching lines @@
   frame_tree_node_->navigator()->FailedNavigation(
       frame_tree_node_, has_stale_copy_in_cache, net_error);
 }
 
 void NavigationRequest::OnRequestStarted(base::TimeTicks timestamp) {
   frame_tree_node_->navigator()->LogResourceRequestTime(timestamp,
                                                         common_params_.url);
 }
 
 }  // namespace content