Followup to transfer serviceworker state during cross site navigations too.

content/browser/service_worker/service_worker_provider_host.cc

 // Copyright 2013 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/service_worker/service_worker_provider_host.h"
 
 #include "base/stl_util.h"
 #include "content/browser/message_port_message_filter.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_context_request_handler.h"
@@ skipping 240 matching lines @@
   associated_patterns_.push_back(pattern);
   IncreaseProcessReference(pattern);
 }
 
 void ServiceWorkerProviderHost::PrepareForCrossSiteTransfer() {
   DCHECK_NE(ChildProcessHost::kInvalidUniqueID, render_process_id_);
 
   for (const GURL& pattern : associated_patterns_)
     DecreaseProcessReference(pattern);
 
-  if (associated_registration_.get())
+  if (associated_registration_.get()) {
     DecreaseProcessReference(associated_registration_->pattern());
+    if (dispatcher_host_) {
+      dispatcher_host_->Send(new ServiceWorkerMsg_DisassociateRegistration(

[michaeln, 2014/12/12 01:22:17]

This is what i had messed up, not disassociating things in the renderer side.

In the context of the browser test, a new processes is not actually started, so
the 'host' gets transferred back into the same process it originally came out
of. But the renderer side asserts that there is no registration when its
handling a ServiceWorkerMsg_AssociateRegistration. That message gets sent inside
of CompleteCrossSiteTransfer and the DCHECK in the renderer was causing the test
to fail.

So we disassociate here first so that we can safely CompleteCrossSiteTransfer
even to the same process.

+          kDocumentMainThreadId, provider_id()));
+    }
+  }
 
   render_process_id_ = ChildProcessHost::kInvalidUniqueID;
   render_frame_id_ = MSG_ROUTING_NONE;
   provider_id_ = kInvalidServiceWorkerProviderId;
   dispatcher_host_ = nullptr;
 }
 
 void ServiceWorkerProviderHost::CompleteCrossSiteTransfer(
     int new_process_id,
     int new_frame_id,
@@ skipping 72 matching lines @@
     context_->process_manager()->RemoveProcessReferenceFromPattern(
         pattern, render_process_id_);
   }
 }
 
 bool ServiceWorkerProviderHost::IsContextAlive() {
   return context_ != NULL;
 }
 
 }  // namespace content