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 ac0ef3fcdfc585756489f2ebc6e74d870178c9e2..1688d0c67f01de9e19c0837ab924daebde36240c 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 "content/browser/frame_host/frame_tree.h"
@@ -26,6 +28,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 {
 
@@ -58,6 +61,15 @@ ServiceWorkerClientInfo FocusOnUIThread(int render_process_id,
 
 }  // anonymous namespace
 
+// PlzNavigate
+int ServiceWorkerProviderHost::kVirtualProcessIDForNavigationRequest = -2;
+
+// PlzNavigate
+int ServiceWorkerProviderHost::GetNextBrowserProviderID() {
+  static base::StaticAtomicSequenceNumber sequence;
+  return -2 - sequence.GetNext();  // Start at -2
+}
+
 ServiceWorkerProviderHost::OneShotGetReadyCallback::OneShotGetReadyCallback(
     const GetRegistrationForReadyCallback& callback)
     : callback(callback),
@@ -86,6 +98,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 == kVirtualProcessIDForNavigationRequest) {
+    CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
+        switches::kEnableBrowserSideNavigation));
+  }
   if (provider_type_ == SERVICE_WORKER_PROVIDER_FOR_CONTROLLER) {
     // Actual thread id is set when the service worker context gets started.
     render_thread_id_ = kInvalidEmbeddedWorkerThreadId;
@@ -511,7 +529,8 @@ void ServiceWorkerProviderHost::CompleteCrossSiteTransfer(
     int new_provider_id,
     ServiceWorkerProviderType new_provider_type,
     ServiceWorkerDispatcherHost* new_dispatcher_host) {
-  DCHECK_EQ(ChildProcessHost::kInvalidUniqueID, render_process_id_);
+  DCHECK(render_process_id_ == ChildProcessHost::kInvalidUniqueID ||
+         render_process_id_ == kVirtualProcessIDForNavigationRequest);
   DCHECK_NE(ChildProcessHost::kInvalidUniqueID, new_process_id);
   DCHECK_NE(MSG_ROUTING_NONE, new_frame_id);