Create ServiceWorkerProviderHost before starting worker

content/browser/service_worker/service_worker_registration_unittest.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_registration.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/files/scoped_temp_dir.h"
@@ skipping 76 matching lines @@
       observed_registration_ = NULL;
       observed_changed_mask_ = ChangedVersionAttributesMask();
       observed_info_ = ServiceWorkerRegistrationInfo();
     }
 
     scoped_refptr<ServiceWorkerRegistration> observed_registration_;
     ChangedVersionAttributesMask observed_changed_mask_;
     ServiceWorkerRegistrationInfo observed_info_;
   };
 
- private:
+ protected:
   std::unique_ptr<EmbeddedWorkerTestHelper> helper_;
   TestBrowserThreadBundle thread_bundle_;
 };
 
 TEST_F(ServiceWorkerRegistrationTest, SetAndUnsetVersions) {
   const GURL kScope("http://www.example.not/");
   const GURL kScript("http://www.example.not/service_worker.js");
   int64_t kRegistrationId = 1L;
   scoped_refptr<ServiceWorkerRegistration> registration =
       new ServiceWorkerRegistration(kScope, kRegistrationId,
@@ skipping 142 matching lines @@
         EmbeddedWorkerTestHelper::CreateHttpResponseInfo());
     ServiceWorkerStatusCode status = SERVICE_WORKER_ERROR_MAX_VALUE;
     context()->storage()->StoreRegistration(
         registration_.get(), version_1.get(),
         CreateReceiverOnCurrentThread(&status));
     base::RunLoop().RunUntilIdle();
     ASSERT_EQ(SERVICE_WORKER_OK, status);
 
     // Give the active version a controllee.
     host_ = CreateProviderHostForWindow(
-        33 /* dummy render process id */, 1 /* dummy provider_id */,
+        helper_->mock_render_process_id(), 1 /* dummy provider_id */,
         true /* is_parent_frame_secure */, context()->AsWeakPtr(),
         &remote_endpoint_);
+    DCHECK(remote_endpoint_.client_request()->is_pending());
+    DCHECK(remote_endpoint_.host_ptr()->is_bound());
     version_1->AddControllee(host_.get());
 
     // Give the active version an in-flight request.
     inflight_request_id_ = CreateInflightRequest(version_1.get());
 
     // Create a waiting version.
     scoped_refptr<ServiceWorkerVersion> version_2 = new ServiceWorkerVersion(
         registration_.get(), kScript, storage()->NewVersionId(),
         context()->AsWeakPtr());
     version_2->set_fetch_handler_existence(
@@ skipping 94 matching lines @@
   EXPECT_EQ(version_1.get(), reg->active_version());
 
   // Finish the request. Activation should happen.
   version_1->FinishRequest(inflight_request_id(), true /* was_handled */,
                            base::Time::Now());
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(version_2.get(), reg->active_version());
 }
 
 }  // namespace content