Remove extensions::ServiceRegistrationManager.

extensions/browser/api/serial/serial_apitest.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 <string>
 
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "content/public/browser/browser_thread.h"
 #include "device/serial/serial_device_enumerator.h"
 #include "device/serial/serial_service_impl.h"
 #include "device/serial/test_serial_io_handler.h"
 #include "extensions/browser/api/serial/serial_api.h"
 #include "extensions/browser/api/serial/serial_connection.h"
+#include "extensions/browser/api/serial/serial_service_factory.h"
 #include "extensions/browser/extension_function.h"
 #include "extensions/common/api/serial.h"
 #include "extensions/common/switches.h"
 #include "extensions/test/result_catcher.h"
-#include "extensions/test/test_service_registration_manager.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using testing::_;
 using testing::Return;
 
 namespace extensions {
 namespace {
 
 class FakeSerialGetDevicesFunction : public AsyncExtensionFunction {
  public:
@@ skipping 73 matching lines @@
 
 class SerialApiTest : public ExtensionApiTest,
                       public testing::WithParamInterface<bool> {
  public:
   SerialApiTest() {}
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     ExtensionApiTest::SetUpCommandLine(command_line);
     if (GetParam())
       command_line->AppendSwitch(switches::kEnableMojoSerialService);
-    test_service_registration_manager_.reset(
-        new TestServiceRegistrationManager);
+  }
+
+  void TearDownOnMainThread() override {
+    SetSerialServiceFactoryForTest(nullptr);
+    ExtensionApiTest::TearDownOnMainThread();
   }
 
  protected:
-  scoped_ptr<TestServiceRegistrationManager> test_service_registration_manager_;
+  base::Callback<void(mojo::InterfaceRequest<device::serial::SerialService>)>
+      serial_service_factory_;
 };
 
 ExtensionFunction* FakeSerialGetDevicesFunctionFactory() {
   return new FakeSerialGetDevicesFunction();
 }
 
 ExtensionFunction* FakeSerialConnectFunctionFactory() {
   return new FakeSerialConnectFunction();
 }
 
@@ skipping 40 matching lines @@
 // on the virtual serial port at 57600 bps. An example is at
 // chrome/test/data/extensions/api_test/serial/api/serial_arduino_test.ino.
 //
 #define SIMULATE_SERIAL_PORTS (1)
 IN_PROC_BROWSER_TEST_P(SerialApiTest, SerialFakeHardware) {
   ResultCatcher catcher;
   catcher.RestrictToBrowserContext(browser()->profile());
 
 #if SIMULATE_SERIAL_PORTS
   if (GetParam()) {
-    test_service_registration_manager_->OverrideServiceFactoryForTest(
-        base::Bind(&CreateTestSerialService));
+    serial_service_factory_ = base::Bind(&CreateTestSerialService);
+    SetSerialServiceFactoryForTest(&serial_service_factory_);
   } else {
     ASSERT_TRUE(ExtensionFunctionDispatcher::OverrideFunction(
         "serial.getDevices", FakeSerialGetDevicesFunctionFactory));
     ASSERT_TRUE(ExtensionFunctionDispatcher::OverrideFunction(
         "serial.connect", FakeSerialConnectFunctionFactory));
   }
 #endif
 
   ASSERT_TRUE(RunExtensionTest("serial/api")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_P(SerialApiTest, SerialRealHardware) {
   ResultCatcher catcher;
   catcher.RestrictToBrowserContext(browser()->profile());
 
   ASSERT_TRUE(RunExtensionTest("serial/real_hardware")) << message_;
 }
 
 INSTANTIATE_TEST_CASE_P(SerialApiTest, SerialApiTest, testing::Bool());
 
 }  // namespace extensions