Create ServiceWorkerProviderHost before starting worker

content/browser/service_worker/service_worker_url_request_job_unittest.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/browser/service_worker/service_worker_url_request_job.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <utility>
@@ skipping 421 matching lines @@
   ~DelayHelper() override {}
 
   void CompleteNavigationPreload() {
     test_->handler()->job()->OnNavigationPreloadResponse();
   }
 
   void CompleteStartWorker() {
     EmbeddedWorkerTestHelper::OnStartWorker(
         embedded_worker_id_, service_worker_version_id_, scope_, script_url_,
         pause_after_download_, std::move(start_worker_request_),
-        std::move(start_worker_instance_host_));
+        std::move(start_worker_instance_host_),
+        std::move(provider_client_info_));
   }
 
   void Respond() {
     response_callback_->OnResponse(
         ServiceWorkerResponse(
             base::MakeUnique<std::vector<GURL>>(), 200, "OK",
             blink::kWebServiceWorkerResponseTypeDefault,
             base::MakeUnique<ServiceWorkerHeaderMap>(), std::string(), 0,
             blink::kWebServiceWorkerResponseErrorUnknown, base::Time(),
             false /* response_is_in_cache_storage */,
             std::string() /* response_cache_storage_cache_name */,
             base::MakeUnique<
                 ServiceWorkerHeaderList>() /* cors_exposed_header_names */),
         base::Time::Now());
     std::move(finish_callback_).Run(SERVICE_WORKER_OK, base::Time::Now());
   }
 
  protected:
-  void OnStartWorker(int embedded_worker_id,
-                     int64_t service_worker_version_id,
-                     const GURL& scope,
-                     const GURL& script_url,
-                     bool pause_after_download,
-                     mojom::ServiceWorkerEventDispatcherRequest request,
-                     mojom::EmbeddedWorkerInstanceHostAssociatedPtrInfo
-                         instance_host) override {
+  void OnStartWorker(
+      int embedded_worker_id,
+      int64_t service_worker_version_id,
+      const GURL& scope,
+      const GURL& script_url,
+      bool pause_after_download,
+      mojom::ServiceWorkerEventDispatcherRequest request,
+      mojom::EmbeddedWorkerInstanceHostAssociatedPtrInfo instance_host,
+      mojom::ServiceWorkerProviderClientInfoPtr provider_client_info) override {
     embedded_worker_id_ = embedded_worker_id;
     service_worker_version_id_ = service_worker_version_id;
     scope_ = scope;
     script_url_ = script_url;
     pause_after_download_ = pause_after_download;
     start_worker_request_ = std::move(request);
     start_worker_instance_host_ = std::move(instance_host);
+    provider_client_info_ = std::move(provider_client_info);
   }
 
   void OnFetchEvent(
       int embedded_worker_id,
       int fetch_event_id,
       const ServiceWorkerFetchRequest& /* request */,
       mojom::FetchEventPreloadHandlePtr preload_handle,
       mojom::ServiceWorkerFetchResponseCallbackPtr response_callback,
       FetchCallback finish_callback) override {
     embedded_worker_id_ = embedded_worker_id;
     fetch_event_id_ = fetch_event_id;
     response_callback_ = std::move(response_callback);
     finish_callback_ = std::move(finish_callback);
     preload_handle_ = std::move(preload_handle);
   }
 
  private:
   int64_t service_worker_version_id_;
   GURL scope_;
   GURL script_url_;
   bool pause_after_download_;
   mojom::ServiceWorkerEventDispatcherRequest start_worker_request_;
   mojom::EmbeddedWorkerInstanceHostAssociatedPtrInfo
       start_worker_instance_host_;
+  mojom::ServiceWorkerProviderClientInfoPtr provider_client_info_;
   int embedded_worker_id_ = 0;
   int fetch_event_id_ = 0;
   mojom::ServiceWorkerFetchResponseCallbackPtr response_callback_;
   mojom::FetchEventPreloadHandlePtr preload_handle_;
   FetchCallback finish_callback_;
   ServiceWorkerURLRequestJobTest* test_;
   DISALLOW_COPY_AND_ASSIGN(DelayHelper);
 };
 
 TEST_F(ServiceWorkerURLRequestJobTest,
@@ skipping 916 matching lines @@
   base::RunLoop().RunUntilIdle();
 
   // The fetch event request should no longer be in-flight.
   EXPECT_FALSE(version_->HasWork());
 }
 
 // TODO(kinuko): Add more tests with different response data and also for
 // FallbackToNetwork case.
 
 }  // namespace content