PlzNavigate: Make ServiceWorker work with PlzNavigate.

content/child/service_worker/service_worker_network_provider.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/child/service_worker/service_worker_network_provider.h"
 
 #include "base/atomic_sequence_num.h"
+#include "base/command_line.h"
 #include "content/child/child_thread_impl.h"
 #include "content/child/service_worker/service_worker_provider_context.h"
 #include "content/common/service_worker/service_worker_messages.h"
+#include "content/public/common/content_switches.h"
 
 namespace content {
 
 namespace {
 
 const char kUserDataKey[] = "SWProviderKey";
 
 // Must be unique in the child process.
 int GetNextProviderId() {
   static base::StaticAtomicSequenceNumber sequence;
@@ skipping 18 matching lines @@
 }
 
 ServiceWorkerNetworkProvider* ServiceWorkerNetworkProvider::FromDocumentState(
     base::SupportsUserData* datasource_userdata) {
   return static_cast<ServiceWorkerNetworkProvider*>(
       datasource_userdata->GetUserData(&kUserDataKey));
 }
 
 ServiceWorkerNetworkProvider::ServiceWorkerNetworkProvider(
     int route_id,
+    ServiceWorkerProviderType provider_type,
+    int browser_provider_id) {

[kinuko, 2015/08/21 14:00:44]

provider_id_(kInvalidServiceWorkerProviderId) here,
remove NOTREACHED on line 64, and just
DCHECK_NE(provider_id_, kInvalidServiceWorkerProviderId) on line 68?

[Fabrice (no longer in Chrome), 2015/08/26 13:23:24]

This won't work because GenerateProviderIdForType can return -1 if type is
SERVICE_WORKER_PROVIDER_FOR_SANDBOXED_FRAME. I refactored the code around to add
a DCHECK.

+  if (browser_provider_id < kInvalidServiceWorkerProviderId) {
+    // PlzNavigate
+    CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
+        switches::kEnableBrowserSideNavigation));
+    // This was a browser-initiated navigation, the ServiceWorkerProviderHost
+    // has already been initialized, copy the provider_id value.
+    provider_id_ = browser_provider_id;
+  } else if (browser_provider_id == kInvalidServiceWorkerProviderId) {
+    // Initialize a new provider ID in all other cases.
+    provider_id_ = GenerateProviderIdForType(provider_type);
+  } else {
+    NOTREACHED() << "The browser_provider_id argument was set to "
+                 << browser_provider_id << ".";
+  }
+
+  if (provider_id_ == kInvalidServiceWorkerProviderId)
+    return;
+
+  context_ = new ServiceWorkerProviderContext(provider_id_);
+  if (!ChildThreadImpl::current())
+    return;  // May be null in some tests.
+
+  ChildThreadImpl::current()->Send(new ServiceWorkerHostMsg_ProviderCreated(
+      provider_id_, route_id, provider_type));
+}
+
+ServiceWorkerNetworkProvider::ServiceWorkerNetworkProvider(
+    int route_id,
     ServiceWorkerProviderType provider_type)
-    : provider_id_(GenerateProviderIdForType(provider_type)) {
-  if (provider_id_ == kInvalidServiceWorkerProviderId)
-    return;
-  context_ = new ServiceWorkerProviderContext(provider_id_);
-  if (!ChildThreadImpl::current())
-    return;  // May be null in some tests.
-  ChildThreadImpl::current()->Send(new ServiceWorkerHostMsg_ProviderCreated(
-      provider_id_, route_id, provider_type));
-}
+    : ServiceWorkerNetworkProvider(route_id,
+                                   provider_type,
+                                   kInvalidServiceWorkerProviderId) {}
 
 ServiceWorkerNetworkProvider::~ServiceWorkerNetworkProvider() {
   if (provider_id_ == kInvalidServiceWorkerProviderId)
     return;
   if (!ChildThreadImpl::current())
     return;  // May be null in some tests.
   ChildThreadImpl::current()->Send(
       new ServiceWorkerHostMsg_ProviderDestroyed(provider_id_));
 }
 
 void ServiceWorkerNetworkProvider::SetServiceWorkerVersionId(
     int64 version_id) {
   DCHECK_NE(kInvalidServiceWorkerProviderId, provider_id_);
   if (!ChildThreadImpl::current())
     return;  // May be null in some tests.
   ChildThreadImpl::current()->Send(
       new ServiceWorkerHostMsg_SetVersionId(provider_id_, version_id));
 }
 
 }  // namespace content