Remove InterfaceRegistry/Provider from service workers

content/browser/service_worker/service_worker_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 <stdint.h>
 #include <tuple>
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 1606 matching lines @@
   explicit CheckPauseAfterDownloadEmbeddedWorkerInstanceClient(
       base::WeakPtr<EmbeddedWorkerTestHelper> helper)
       : EmbeddedWorkerTestHelper::MockEmbeddedWorkerInstanceClient(helper) {}
   int num_of_startworker() const { return num_of_startworker_; }
   void set_next_pause_after_download(bool expectation) {
     next_pause_after_download_ = expectation;
   }
 
  protected:
   void StartWorker(
-      const EmbeddedWorkerStartParams& params,
-      service_manager::mojom::InterfaceProviderPtr browser_interfaces,
-      service_manager::mojom::InterfaceProviderRequest renderer_request)
-      override {
+      const EmbeddedWorkerStartParamsInternal& params,
+      mojom::ServiceWorkerEventDispatcherRequest request) override {
     ASSERT_TRUE(next_pause_after_download_.has_value());
     EXPECT_EQ(next_pause_after_download_.value(), params.pause_after_download);
     num_of_startworker_++;
     EmbeddedWorkerTestHelper::MockEmbeddedWorkerInstanceClient::StartWorker(
-        params, std::move(browser_interfaces), std::move(renderer_request));
+        params, std::move(request));
   }
 
  private:
   base::Optional<bool> next_pause_after_download_;
   int num_of_startworker_ = 0;
   DISALLOW_COPY_AND_ASSIGN(CheckPauseAfterDownloadEmbeddedWorkerInstanceClient);
 };
 
 TEST_P(ServiceWorkerJobTestP, Update_PauseAfterDownload) {
   UpdateJobTestHelper* update_helper = new UpdateJobTestHelper;
@@ skipping 16 matching lines @@
   scoped_refptr<ServiceWorkerRegistration> registration =
       update_helper->SetupInitialRegistration(kNewVersionOrigin);
   if (is_mojo_enabled()) {
     ASSERT_EQ(1, clients[0]->num_of_startworker());
   } else {
     const IPC::Message* start_msg =
         sink->GetUniqueMessageMatching(EmbeddedWorkerMsg_StartWorker::ID);
     ASSERT_TRUE(start_msg);
     EmbeddedWorkerMsg_StartWorker::Param param;
     EmbeddedWorkerMsg_StartWorker::Read(start_msg, &param);
-    const EmbeddedWorkerStartParams& start_params = std::get<0>(param);
+    const EmbeddedWorkerStartParamsInternal& start_params = std::get<0>(param);
     EXPECT_FALSE(start_params.pause_after_download);
     sink->ClearMessages();
   }
 
   // The updated version should pause after download.
   if (is_mojo_enabled())
     clients[1]->set_next_pause_after_download(true);
   registration->AddListener(update_helper);
   registration->active_version()->StartUpdate();
   base::RunLoop().RunUntilIdle();
   if (is_mojo_enabled()) {
     ASSERT_EQ(1, clients[1]->num_of_startworker());
   } else {
     const IPC::Message* start_msg =
         sink->GetUniqueMessageMatching(EmbeddedWorkerMsg_StartWorker::ID);
     ASSERT_TRUE(start_msg);
     EmbeddedWorkerMsg_StartWorker::Param param;
     EmbeddedWorkerMsg_StartWorker::Read(start_msg, &param);
-    const EmbeddedWorkerStartParams& start_params = std::get<0>(param);
+    const EmbeddedWorkerStartParamsInternal& start_params = std::get<0>(param);
     EXPECT_TRUE(start_params.pause_after_download);
     sink->ClearMessages();
   }
 }
 
 // Test that activation doesn't complete if it's triggered by removing a
 // controllee and starting the worker failed due to shutdown.
 TEST_P(ServiceWorkerJobTestP, ActivateCancelsOnShutdown) {
   UpdateJobTestHelper* update_helper = new UpdateJobTestHelper;
   helper_.reset(update_helper);
@@ skipping 47 matching lines @@
   EXPECT_EQ(new_version.get(), registration->active_version());
   EXPECT_EQ(ServiceWorkerVersion::ACTIVATING, new_version->status());
   registration->RemoveListener(update_helper);
 }
 
 INSTANTIATE_TEST_CASE_P(ServiceWorkerJobTest,
                         ServiceWorkerJobTestP,
                         ::testing::Values(false, true));
 
 }  // namespace content