Create ServiceWorkerProviderHost before starting worker

content/browser/service_worker/embedded_worker_instance_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/embedded_worker_instance.h"
 
 #include <stdint.h>
 #include <utility>
 #include <vector>
 
@@ skipping 26 matching lines @@
 
 void SaveStatusAndCall(ServiceWorkerStatusCode* out,
                        const base::Closure& callback,
                        ServiceWorkerStatusCode status) {
   *out = status;
   callback.Run();
 }
 
 }  // namespace
 
+class MockServiceWorkerProviderHost : public ServiceWorkerProviderHost {
+ public:
+  MockServiceWorkerProviderHost(base::WeakPtr<ServiceWorkerContextCore> context)
+      : ServiceWorkerProviderHost(ChildProcessHost::kInvalidUniqueID,
+                                  ServiceWorkerProviderHostInfo(
+                                      kInvalidServiceWorkerProviderId,
+                                      MSG_ROUTING_NONE,
+                                      SERVICE_WORKER_PROVIDER_FOR_CONTROLLER,
+                                      false),
+                                  context,
+                                  nullptr),
+        binding_(this) {}
+
+  ~MockServiceWorkerProviderHost() override {}
+
+  void CompleteStartWorkerPreparation(int process_id,
+                                      mojom::ServiceWorkerProviderClientInfoPtr*
+                                          provider_client_info) override {
+    // Nothing to do.
+    DCHECK(!binding_.is_bound());
+    DCHECK(!client_.is_bound());
+    binding_.Bind(mojo::MakeRequest(&(*provider_client_info)->host_ptr_info));
+    (*provider_client_info)->client_request = mojo::MakeRequest(&client_);
+  }
+
+ private:
+  mojom::ServiceWorkerProviderAssociatedPtr client_;
+  mojo::AssociatedBinding<mojom::ServiceWorkerProviderHost> binding_;
+
+  DISALLOW_COPY_AND_ASSIGN(MockServiceWorkerProviderHost);
+};
+
 class EmbeddedWorkerInstanceTest : public testing::Test,
                                    public EmbeddedWorkerInstance::Listener {
  protected:
   EmbeddedWorkerInstanceTest()
       : thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP) {}
 
   enum EventType {
     PROCESS_ALLOCATED,
     START_WORKER_MESSAGE_SENT,
     STARTED,
@@ skipping 18 matching lines @@
     RecordEvent(START_WORKER_MESSAGE_SENT);
   }
   void OnStarted() override { RecordEvent(STARTED); }
   void OnStopped(EmbeddedWorkerStatus old_status) override {
     RecordEvent(STOPPED, old_status);
   }
   void OnDetached(EmbeddedWorkerStatus old_status) override {
     RecordEvent(DETACHED, old_status);
   }
 
-  bool OnMessageReceived(const IPC::Message& message) override { return false; }
+  bool OnMessageReceived(const IPC::Message&) override { return false; }
 
   void SetUp() override {
     helper_.reset(new EmbeddedWorkerTestHelper(base::FilePath()));
   }
 
   void TearDown() override { helper_.reset(); }
 
   ServiceWorkerStatusCode StartWorker(EmbeddedWorkerInstance* worker,
                                       int id, const GURL& pattern,
                                       const GURL& url) {
@@ skipping 10 matching lines @@
 
   std::unique_ptr<EmbeddedWorkerStartParams>
   CreateStartParams(int version_id, const GURL& scope, const GURL& script_url) {
     std::unique_ptr<EmbeddedWorkerStartParams> params =
         base::MakeUnique<EmbeddedWorkerStartParams>();
     params->service_worker_version_id = version_id;
     params->scope = scope;
     params->script_url = script_url;
     params->pause_after_download = false;
     params->is_installed = false;
+    mock_providers_.emplace_back(
+        base::MakeUnique<MockServiceWorkerProviderHost>(
+            helper_->context()->AsWeakPtr()));
+    params->controller_provider = mock_providers_.back().get();
     return params;
   }
 
   mojom::ServiceWorkerEventDispatcherRequest CreateEventDispatcher() {
     dispatchers_.emplace_back();
     return mojo::MakeRequest(&dispatchers_.back());
   }
 
   ServiceWorkerContextCore* context() { return helper_->context(); }
 
   EmbeddedWorkerRegistry* embedded_worker_registry() {
     DCHECK(context());
     return context()->embedded_worker_registry();
   }
 
   IPC::TestSink* ipc_sink() { return helper_->ipc_sink(); }
 
   std::vector<std::unique_ptr<
       EmbeddedWorkerTestHelper::MockEmbeddedWorkerInstanceClient>>*
   mock_instance_clients() {
     return helper_->mock_instance_clients();
   }
 
   std::vector<mojom::ServiceWorkerEventDispatcherPtr> dispatchers_;
+  std::vector<std::unique_ptr<MockServiceWorkerProviderHost>> mock_providers_;
 
   TestBrowserThreadBundle thread_bundle_;
   std::unique_ptr<EmbeddedWorkerTestHelper> helper_;
   std::vector<EventLog> events_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(EmbeddedWorkerInstanceTest);
 };
 
 // A helper to simulate the start worker sequence is stalled in a worker
 // process.
 class StalledInStartWorkerHelper : public EmbeddedWorkerTestHelper {
  public:
   StalledInStartWorkerHelper() : EmbeddedWorkerTestHelper(base::FilePath()) {}
   ~StalledInStartWorkerHelper() 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) 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 {
     if (force_stall_in_start_) {
       // Prepare for OnStopWorker().
       instance_host_ptr_map_[embedded_worker_id].Bind(std::move(instance_host));
       // Do nothing to simulate a stall in the worker process.
       return;
     }
     EmbeddedWorkerTestHelper::OnStartWorker(
         embedded_worker_id, service_worker_version_id, scope, script_url,
-        pause_after_download, std::move(request), std::move(instance_host));
+        pause_after_download, std::move(request), std::move(instance_host),
+        std::move(provider_client_info));
   }
 
   void OnStopWorker(int embedded_worker_id) override {
     if (instance_host_ptr_map_[embedded_worker_id]) {
       instance_host_ptr_map_[embedded_worker_id]->OnStopped();
       base::RunLoop().RunUntilIdle();
       return;
     }
     EmbeddedWorkerTestHelper::OnStopWorker(embedded_worker_id);
   }
@@ skipping 533 matching lines @@
 }
 
 class FailEmbeddedWorkerInstanceClientImpl
     : public EmbeddedWorkerTestHelper::MockEmbeddedWorkerInstanceClient {
  public:
   explicit FailEmbeddedWorkerInstanceClientImpl(
       base::WeakPtr<EmbeddedWorkerTestHelper> helper)
       : EmbeddedWorkerTestHelper::MockEmbeddedWorkerInstanceClient(helper) {}
 
  private:
-  void StartWorker(
-      const EmbeddedWorkerStartParams& /* unused */,
-      mojom::ServiceWorkerEventDispatcherRequest /* unused */,
-      mojom::EmbeddedWorkerInstanceHostAssociatedPtrInfo /* unused */)
-      override {
+  void StartWorker(const EmbeddedWorkerStartParams&,
+                   mojom::ServiceWorkerEventDispatcherRequest,
+                   mojom::EmbeddedWorkerInstanceHostAssociatedPtrInfo,
+                   mojom::ServiceWorkerProviderClientInfoPtr) override {
     helper_->mock_instance_clients()->clear();
   }
 };
 
 TEST_F(EmbeddedWorkerInstanceTest, RemoveRemoteInterface) {
   const int64_t version_id = 55L;
   const GURL pattern("http://example.com/");
   const GURL url("http://example.com/worker.js");
 
   // Let StartWorker fail; binding is discarded in the middle of IPC
@@ skipping 88 matching lines @@
   ASSERT_EQ(1UL, instance_client_rawptr->message().size());
   EXPECT_EQ(test_message, instance_client_rawptr->message()[0]);
 
   // Ensure the worker is stopped.
   worker->Stop();
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(EmbeddedWorkerStatus::STOPPED, worker->status());
 }
 
 }  // namespace content