Eliminate InterfaceRegistry

media/mojo/services/media_service_unittest.cc

 // Copyright 2015 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 <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "media/base/cdm_config.h"
 #include "media/base/mock_filters.h"
 #include "media/base/test_helpers.h"
 #include "media/mojo/clients/mojo_demuxer_stream_impl.h"
 #include "media/mojo/common/media_type_converters.h"
 #include "media/mojo/interfaces/content_decryption_module.mojom.h"
 #include "media/mojo/interfaces/decryptor.mojom.h"
 #include "media/mojo/interfaces/interface_factory.mojom.h"
 #include "media/mojo/interfaces/media_service.mojom.h"
 #include "media/mojo/interfaces/renderer.mojom.h"
+#include "media/mojo/services/media_interface_provider.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
-#include "services/service_manager/public/cpp/interface_registry.h"
 #include "services/service_manager/public/cpp/service_test.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using testing::Exactly;
 using testing::Invoke;
 using testing::InvokeWithoutArgs;
 using testing::StrictMock;
 
 namespace media {
 namespace {
@@ skipping 35 matching lines @@
         renderer_client_binding_(&renderer_client_),
         video_stream_(DemuxerStream::VIDEO) {}
   ~MediaServiceTest() override {}
 
   void SetUp() override {
     ServiceTest::SetUp();
 
     media::mojom::MediaServicePtr media_service;
     connector()->BindInterface("media", &media_service);
 
-    auto registry =
-        base::MakeUnique<service_manager::InterfaceRegistry>(std::string());
     service_manager::mojom::InterfaceProviderPtr interfaces;
-    registry->Bind(MakeRequest(&interfaces), service_manager::Identity(),
-                   service_manager::InterfaceProviderSpec(),
-                   service_manager::Identity(),
-                   service_manager::InterfaceProviderSpec());
-
+    auto provider = base::MakeUnique<MediaInterfaceProvider>(
+        mojo::MakeRequest(&interfaces));
     media_service->CreateInterfaceFactory(
         mojo::MakeRequest(&interface_factory_), std::move(interfaces));
 
     run_loop_.reset(new base::RunLoop());
   }
 
   // MOCK_METHOD* doesn't support move only types. Work around this by having
   // an extra method.
   MOCK_METHOD2(OnCdmInitializedInternal, void(bool result, int cdm_id));
   void OnCdmInitialized(mojom::CdmPromiseResultPtr result,
@@ skipping 115 matching lines @@
   // close the connection.
   EXPECT_CALL(*this, ConnectionClosed())
       .Times(Exactly(1))
       .WillOnce(Invoke(run_loop_.get(), &base::RunLoop::Quit));
   interface_factory_.reset();
 
   run_loop_->Run();
 }
 
 }  // namespace media