media: Only provide necessary services in ServiceFactoryImpl

media/mojo/services/media_apptest.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 <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/macros.h"
@@ skipping 13 matching lines @@
 #include "testing/gmock/include/gmock/gmock.h"
 
 using testing::Exactly;
 using testing::Invoke;
 using testing::InvokeWithoutArgs;
 using testing::StrictMock;
 
 namespace media {
 namespace {
 
+#if defined(ENABLE_MOJO_CDM)
 const char kInvalidKeySystem[] = "invalid.key.system";
+#endif
 const char kSecurityOrigin[] = "http://foo.com";
 
 class MockRendererClient : public interfaces::RendererClient {
  public:
   MockRendererClient(){};
   ~MockRendererClient() override{};
 
   // interfaces::RendererClient implementation.
   MOCK_METHOD2(OnTimeUpdate, void(int64_t time_usec, int64_t max_time_usec));
   MOCK_METHOD1(OnBufferingStateChange, void(interfaces::BufferingState state));
@@ skipping 12 matching lines @@
   ~MediaAppTest() override {}
 
   void SetUp() override {
     ApplicationTestBase::SetUp();
 
     connection_ = connector()->Connect("mojo:media");
     connection_->SetConnectionLostClosure(
         base::Bind(&MediaAppTest::ConnectionClosed, base::Unretained(this)));
 
     connection_->GetInterface(&service_factory_);
-    service_factory_->CreateCdm(mojo::GetProxy(&cdm_));
-    service_factory_->CreateRenderer(mojo::GetProxy(&renderer_));
 
     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(interfaces::CdmPromiseResultPtr result,
                         int cdm_id,
                         interfaces::DecryptorPtr decryptor) {
     OnCdmInitializedInternal(result->success, cdm_id);
   }
 
   void InitializeCdm(const std::string& key_system,
                      bool expected_result,
                      int cdm_id) {
+    service_factory_->CreateCdm(mojo::GetProxy(&cdm_));
+
     EXPECT_CALL(*this, OnCdmInitializedInternal(expected_result, cdm_id))
         .Times(Exactly(1))
         .WillOnce(InvokeWithoutArgs(run_loop_.get(), &base::RunLoop::Quit));
     cdm_->Initialize(
         key_system, kSecurityOrigin, interfaces::CdmConfig::From(CdmConfig()),
         base::Bind(&MediaAppTest::OnCdmInitialized, base::Unretained(this)));
   }
 
   MOCK_METHOD1(OnRendererInitialized, void(bool));
 
   void InitializeRenderer(const VideoDecoderConfig& video_config,
                           bool expected_result) {
+    service_factory_->CreateRenderer(mojo::GetProxy(&renderer_));
+
     video_demuxer_stream_.set_video_decoder_config(video_config);
 
     interfaces::DemuxerStreamPtr video_stream;
     new MojoDemuxerStreamImpl(&video_demuxer_stream_, GetProxy(&video_stream));
 
     EXPECT_CALL(*this, OnRendererInitialized(expected_result))
         .Times(Exactly(1))
         .WillOnce(InvokeWithoutArgs(run_loop_.get(), &base::RunLoop::Quit));
     renderer_->Initialize(renderer_client_binding_.CreateInterfacePtrAndBind(),
                           nullptr, std::move(video_stream),
@@ skipping 19 matching lines @@
   scoped_ptr<mojo::Connection> connection_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaAppTest);
 };
 
 }  // 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(MediaAppTest, InitializeCdm_Success) {
   InitializeCdm(kClearKey, true, 1);
   run_loop_->Run();
 }
 
 TEST_F(MediaAppTest, InitializeCdm_InvalidKeySystem) {
   InitializeCdm(kInvalidKeySystem, false, 0);
   run_loop_->Run();
 }
+#endif  // defined(ENABLE_MOJO_CDM)
 
+#if defined(ENABLE_MOJO_RENDERER)
 // Sometimes fails on Linux. http://crbug.com/594977
 #if defined(OS_LINUX)
 #define MAYBE_InitializeRenderer_Success DISABLED_InitializeRenderer_Success
 #else
 #define MAYBE_InitializeRenderer_Success InitializeRenderer_Success
 #endif
 
 TEST_F(MediaAppTest, MAYBE_InitializeRenderer_Success) {
   InitializeRenderer(TestVideoConfig::Normal(), true);
   run_loop_->Run();
 }
 
 TEST_F(MediaAppTest, InitializeRenderer_InvalidConfig) {
   InitializeRenderer(TestVideoConfig::Invalid(), false);
   run_loop_->Run();
 }
+#endif  // defined(ENABLE_MOJO_RENDERER)
 
 TEST_F(MediaAppTest, Lifetime) {
   // Disconnecting CDM and Renderer services doesn't terminate the app.
   cdm_.reset();
   renderer_.reset();
 
   // Disconnecting ServiceFactory 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));
   service_factory_.reset();
 
   run_loop_->Run();
 }
 
 }  // namespace media