Service Worker: Detach the controller when falling back to network on failure

content/browser/service_worker/service_worker_url_request_job_unittest.cc

Index: content/browser/service_worker/service_worker_url_request_job_unittest.cc
diff --git a/content/browser/service_worker/service_worker_url_request_job_unittest.cc b/content/browser/service_worker/service_worker_url_request_job_unittest.cc
index 2d709d04f91ee4ff2e8f4e0f8c194f21f6a2d59f..302fb034a8839bc8f3113297cbd607c7bea9960a 100644
--- a/content/browser/service_worker/service_worker_url_request_job_unittest.cc
+++ b/content/browser/service_worker/service_worker_url_request_job_unittest.cc
@@ -168,9 +168,9 @@ class ServiceWorkerURLRequestJobTest : public testing::Test {
                                       helper_->context()->AsWeakPtr(),
                                       nullptr));
     provider_host->SetDocumentUrl(GURL("http://example.com/"));
+    registration_->SetActiveVersion(version_);
     provider_host->AssociateRegistration(registration_.get(),
                                          false /* notify_controllerchange */);
-    registration_->SetActiveVersion(version_);
 
     ChromeBlobStorageContext* chrome_blob_storage_context =
         ChromeBlobStorageContext::GetFor(browser_context_.get());
@@ -640,6 +640,10 @@ TEST_F(ServiceWorkerURLRequestJobTest, FailFetchDispatch) {
   EXPECT_EQ(200, request_->GetResponseCode());
   EXPECT_EQ("PASS", url_request_delegate_.response_data());
   EXPECT_FALSE(HasInflightRequests());
+  ServiceWorkerProviderHost* host =
+      helper_->context()->GetProviderHost(kProcessID, kProviderID);
+  ASSERT_TRUE(host);
+  EXPECT_EQ(host->controlling_version(), nullptr);
 }
 
 // TODO(horo): Remove this test when crbug.com/485900 is fixed.