PlzNavigate: Make ServiceWorker work with PlzNavigate.

content/browser/service_worker/service_worker_provider_host.cc

Index: content/browser/service_worker/service_worker_provider_host.cc
diff --git a/content/browser/service_worker/service_worker_provider_host.cc b/content/browser/service_worker/service_worker_provider_host.cc
index d27ceb40602b71fea60092d55c96cb3e9b71b7dc..d8144e605435b8ecd682881e19f2b3054423f737 100644
--- a/content/browser/service_worker/service_worker_provider_host.cc
+++ b/content/browser/service_worker/service_worker_provider_host.cc
@@ -4,6 +4,8 @@
 
 #include "content/browser/service_worker/service_worker_provider_host.h"
 
+#include "base/atomic_sequence_num.h"
+#include "base/command_line.h"
 #include "base/guid.h"
 #include "base/stl_util.h"
 #include "base/time/time.h"
@@ -27,6 +29,7 @@
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/child_process_host.h"
+#include "content/public/common/content_switches.h"
 
 namespace content {
 
@@ -59,6 +62,15 @@ ServiceWorkerClientInfo FocusOnUIThread(int render_process_id,
 
 }  // anonymous namespace
 
+// PlzNavigate
+int ServiceWorkerProviderHost::kVirtualProcessIDForBrowserRequest = -2;
+
+// PlzNavigate
+int ServiceWorkerProviderHost::GetNextBrowserProviderID() {
+  static base::StaticAtomicSequenceNumber sequence;
+  return -2 - sequence.GetNext();  // Start at -2
+}
+
 ServiceWorkerProviderHost::OneShotGetReadyCallback::OneShotGetReadyCallback(
     const GetRegistrationForReadyCallback& callback)
     : callback(callback),
@@ -87,6 +99,12 @@ ServiceWorkerProviderHost::ServiceWorkerProviderHost(
   DCHECK_NE(ChildProcessHost::kInvalidUniqueID, render_process_id_);
   DCHECK_NE(SERVICE_WORKER_PROVIDER_UNKNOWN, provider_type_);
   DCHECK_NE(SERVICE_WORKER_PROVIDER_FOR_SANDBOXED_FRAME, provider_type_);
+
+  // PlzNavigate:
+  if (render_process_id == kVirtualProcessIDForBrowserRequest) {
+    CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
+        switches::kEnableBrowserSideNavigation));
+  }

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

If-blocks existing solely for CHECK-ing something are generally frowned upon. I
recommend changing this to:

CHECK_IMPLIES(render_process_id == kVirtualProcessIDForBrowserRequest, 
              base::CommandLine::ForCurrentProcess()->HasSwitch(
                  switches::kEnableBrowserSideNavigation));

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

Done.

   if (provider_type_ == SERVICE_WORKER_PROVIDER_FOR_CONTROLLER) {
     // Actual thread id is set when the service worker context gets started.
     render_thread_id_ = kInvalidEmbeddedWorkerThreadId;
@@ -512,6 +530,8 @@ void ServiceWorkerProviderHost::CompleteCrossSiteTransfer(
     int new_provider_id,
     ServiceWorkerProviderType new_provider_type,
     ServiceWorkerDispatcherHost* new_dispatcher_host) {
+  CHECK(!base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableBrowserSideNavigation));
   DCHECK_EQ(ChildProcessHost::kInvalidUniqueID, render_process_id_);
   DCHECK_NE(ChildProcessHost::kInvalidUniqueID, new_process_id);
   DCHECK_NE(MSG_ROUTING_NONE, new_frame_id);
@@ -541,6 +561,21 @@ void ServiceWorkerProviderHost::CompleteCrossSiteTransfer(
   }
 }
 
+void ServiceWorkerProviderHost::CompleteBrowserInitialized(int process_id,

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

nit: add previous line with: // PlzNavigate

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

Done.

+                                                           int frame_id) {
+  CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableBrowserSideNavigation));
+  DCHECK_EQ(kVirtualProcessIDForBrowserRequest, render_process_id_);
+  DCHECK_EQ(SERVICE_WORKER_PROVIDER_FOR_WINDOW, provider_type_);
+  DCHECK_EQ(kDocumentMainThreadId, render_thread_id_);
+
+  DCHECK_NE(ChildProcessHost::kInvalidUniqueID, process_id);
+  DCHECK_NE(MSG_ROUTING_NONE, frame_id);
+
+  render_process_id_ = process_id;
+  route_id_ = frame_id;
+}
+
 void ServiceWorkerProviderHost::SendUpdateFoundMessage(
     int registration_handle_id) {
   if (!dispatcher_host_)