media: Pass CdmConfig in mojo CDM interface.

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 "base/bind.h"
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.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/cdm/key_system_names.h"
 #include "media/mojo/interfaces/content_decryption_module.mojom.h"
 #include "media/mojo/interfaces/media_renderer.mojom.h"
+#include "media/mojo/services/media_type_converters.h"
 #include "media/mojo/services/mojo_demuxer_stream_impl.h"
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/application/public/cpp/application_test_base.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using testing::Exactly;
 using testing::Invoke;
 using testing::InvokeWithoutArgs;
 using testing::StrictMock;
@@ skipping 45 matching lines @@
   MOCK_METHOD1(OnCdmInitializedInternal, void(bool result));
   void OnCdmInitialized(mojo::CdmPromiseResultPtr result) {
     OnCdmInitializedInternal(result->success);
   }
 
   void InitializeCdm(const std::string& key_system, bool expected_result) {
     EXPECT_CALL(*this, OnCdmInitializedInternal(expected_result))
         .Times(Exactly(1))
         .WillOnce(InvokeWithoutArgs(run_loop_.get(), &base::RunLoop::Quit));
     cdm_->Initialize(
-        key_system, kSecurityOrigin, 1,
+        key_system, kSecurityOrigin, mojo::CdmConfig::From(CdmConfig()), 1,
         base::Bind(&MediaAppTest::OnCdmInitialized, base::Unretained(this)));
   }
 
   MOCK_METHOD0(OnRendererInitialized, void());
 
   void InitializeRenderer(const VideoDecoderConfig& video_config) {
     video_demuxer_stream_.set_video_decoder_config(video_config);
 
     mojo::DemuxerStreamPtr video_stream;
     new MojoDemuxerStreamImpl(&video_demuxer_stream_, GetProxy(&video_stream));
@@ skipping 44 matching lines @@
   run_loop_->Run();
 }
 
 TEST_F(MediaAppTest, InitializeRenderer_InvalidConfig) {
   EXPECT_CALL(media_renderer_client_, OnError());
   InitializeRenderer(TestVideoConfig::Invalid());
   run_loop_->Run();
 }
 
 }  // namespace media