media: Fix media_mojo_shell_unittests

media/mojo/services/media_mojo_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/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 "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 24 matching lines @@
   MOCK_METHOD0(OnWaitingForDecryptionKey, void());
   MOCK_METHOD1(OnDurationChange, void(base::TimeDelta duration));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockRendererClient);
 };
 
 class MediaServiceTest : public service_manager::test::ServiceTest {
  public:
   MediaServiceTest()
-      : ServiceTest("media_mojo_unittests"),
+      : ServiceTest("media_mojo_shell_unittests"),
         renderer_client_binding_(&renderer_client_),
         video_stream_(DemuxerStream::VIDEO) {}
   ~MediaServiceTest() override {}
 
   void SetUp() override {
     ServiceTest::SetUp();
 
     connection_ = connector()->Connect("media");
-    connection_->SetConnectionLostClosure(base::Bind(
-        &MediaServiceTest::ConnectionClosed, base::Unretained(this)));
+    media::mojom::MediaServicePtr media_service;
+    connection_->GetInterface(&media_service);
 
-    connection_->GetInterface(&interface_factory_);
+    auto registry =
+        base::MakeUnique<service_manager::InterfaceRegistry>(std::string());
+    service_manager::mojom::InterfaceProviderPtr interfaces;
+    registry->Bind(GetProxy(&interfaces), service_manager::Identity(),
+                   service_manager::InterfaceProviderSpec(),
+                   service_manager::Identity(),
+                   service_manager::InterfaceProviderSpec());
+
+    media_service->CreateInterfaceFactory(mojo::GetProxy(&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,
                         int cdm_id,
                         mojom::DecryptorPtr decryptor) {
@@ skipping 37 matching lines @@
     renderer_->Initialize(std::move(client_ptr_info), nullptr,
                           std::move(video_stream_proxy), base::nullopt,
                           base::nullopt,
                           base::Bind(&MediaServiceTest::OnRendererInitialized,
                                      base::Unretained(this)));
   }
 
   MOCK_METHOD0(ConnectionClosed, void());
 
  protected:
+  std::unique_ptr<service_manager::Connection> connection_;
   std::unique_ptr<base::RunLoop> run_loop_;
 
   mojom::InterfaceFactoryPtr interface_factory_;
   mojom::ContentDecryptionModulePtr cdm_;
   mojom::RendererPtr renderer_;
 
   StrictMock<MockRendererClient> renderer_client_;
   mojo::AssociatedBinding<mojom::RendererClient> renderer_client_binding_;
 
   StrictMock<MockDemuxerStream> video_stream_;
   std::unique_ptr<MojoDemuxerStreamImpl> mojo_video_stream_;
 
  private:
-  std::unique_ptr<service_manager::Connection> connection_;
-
   DISALLOW_COPY_AND_ASSIGN(MediaServiceTest);
 };
 
 }  // namespace
 
 // Note: base::RunLoop::RunUntilIdle() does not work well in these tests because
 // even when the loop is idle, we may still have pending events in the pipe.
 
 #if defined(ENABLE_MOJO_CDM)
 TEST_F(MediaServiceTest, InitializeCdm_Success) {
@@ skipping 20 matching lines @@
   run_loop_->Run();
 }
 
 TEST_F(MediaServiceTest, InitializeRenderer_InvalidConfig) {
   InitializeRenderer(TestVideoConfig::Invalid(), false);
   run_loop_->Run();
 }
 #endif  // defined(ENABLE_MOJO_RENDERER)
 
 TEST_F(MediaServiceTest, Lifetime) {
+  connection_->SetConnectionLostClosure(
+      base::Bind(&MediaServiceTest::ConnectionClosed, base::Unretained(this)));
+
   // Disconnecting CDM and Renderer services doesn't terminate the app.
   cdm_.reset();
   renderer_.reset();
 
   // Disconnecting InterfaceFactory service should terminate the app, which will
   // 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