ServiceWorker: use the id assigned to the provider host in unittests

In several tests, currently provider's id is assigned to a variable which is
initialized by some random value at the beginning of the test, the provider host
instance is created by using the id, and some other objects are also initialized
by the id. After browser-side SWProviderHost creation, it'll be problematic
because the id will be assigned internally. This patch is to fix the tests by
getting the id from ServiceWorkerProviderHost::provider_id() directly.

This is split off from https://crrev.com/2779763004/ .

BUG=629701, 676983, 668633

Review-Url: https://codereview.chromium.org/2932273002
Cr-Commit-Position: refs/heads/master@{#478560}

content/browser/service_worker/foreign_fetch_request_handler_unittest.cc

@@ -146,7 +146,7 @@ class ForeignFetchRequestHandlerTest : public testing::Test {
       request_->set_initiator(url::Origin(GURL(initiator)));
     ForeignFetchRequestHandler::InitializeHandler(
         request_.get(), context_wrapper(), &blob_storage_context_,
-        helper_->mock_render_process_id(), kMockProviderId,
+        helper_->mock_render_process_id(), provider_host()->provider_id(),
         ServiceWorkerMode::ALL, FETCH_REQUEST_MODE_CORS,
         FETCH_CREDENTIALS_MODE_OMIT, FetchRedirectMode::FOLLOW_MODE,
         resource_type, REQUEST_CONTEXT_TYPE_FETCH,

content/browser/service_worker/service_worker_registration_unittest.cc

@@ -94,7 +94,7 @@ class ServiceWorkerRegistrationTest : public testing::Test {
     ServiceWorkerRegistrationInfo observed_info_;
   };
 
- private:
+ protected:
   std::unique_ptr<EmbeddedWorkerTestHelper> helper_;
   TestBrowserThreadBundle thread_bundle_;
 };
@@ -257,7 +257,7 @@ class ServiceWorkerActivationTest : public ServiceWorkerRegistrationTest {
 
     // 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_);
     version_1->AddControllee(host_.get());

content/browser/service_worker/service_worker_write_to_cache_job_unittest.cc

@@ -286,7 +286,7 @@ class ServiceWorkerWriteToCacheJobTest : public testing::Test {
         mock_protocol_handler_(nullptr) {}
   ~ServiceWorkerWriteToCacheJobTest() override {}
 
-  void CreateHostForVersion(
+  base::WeakPtr<ServiceWorkerProviderHost> CreateHostForVersion(
       int process_id,
       int provider_id,
       const scoped_refptr<ServiceWorkerVersion>& version) {
@@ -297,6 +297,7 @@ class ServiceWorkerWriteToCacheJobTest : public testing::Test {
     base::WeakPtr<ServiceWorkerProviderHost> provider_host = host->AsWeakPtr();
     context()->AddProviderHost(std::move(host));
     provider_host->running_hosted_version_ = version;
+    return provider_host;
   }
 
   void SetUpScriptRequest(int process_id, int provider_id) {
@@ -339,9 +340,10 @@ class ServiceWorkerWriteToCacheJobTest : public testing::Test {
     version_ =
         new ServiceWorkerVersion(registration_.get(), script_url_,
                                  NextVersionId(), context()->AsWeakPtr());
-    CreateHostForVersion(helper_->mock_render_process_id(), provider_id,
-                         version_);
-    SetUpScriptRequest(helper_->mock_render_process_id(), provider_id);
+    base::WeakPtr<ServiceWorkerProviderHost> host = CreateHostForVersion(
+        helper_->mock_render_process_id(), provider_id, version_);
+    ASSERT_TRUE(host);
+    SetUpScriptRequest(helper_->mock_render_process_id(), host->provider_id());
 
     context()->storage()->LazyInitialize(base::Bind(&EmptyCallback));
     base::RunLoop().RunUntilIdle();
@@ -394,10 +396,10 @@ class ServiceWorkerWriteToCacheJobTest : public testing::Test {
         new ServiceWorkerVersion(registration_.get(), script_url_,
                                  NextVersionId(), context()->AsWeakPtr());
     new_version->set_pause_after_download(true);
-    CreateHostForVersion(helper_->mock_render_process_id(), provider_id,
-                         new_version);
+    base::WeakPtr<ServiceWorkerProviderHost> host = CreateHostForVersion(
+        helper_->mock_render_process_id(), provider_id, new_version);
 
-    SetUpScriptRequest(helper_->mock_render_process_id(), provider_id);
+    SetUpScriptRequest(helper_->mock_render_process_id(), host->provider_id());
     mock_protocol_handler_->SetCreateJobCallback(
         base::Bind(&CreateResponseJob, response));
     request_->Start();