media: Pass CdmConfig in mojo CDM interface.

media/mojo/services/mojo_cdm_service.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 "media/mojo/services/mojo_cdm_service.h"
 
 #include "base/bind.h"
 #include "media/base/cdm_config.h"
 #include "media/base/cdm_factory.h"
 #include "media/base/cdm_key_information.h"
@@ skipping 29 matching lines @@
     context_->UnregisterCdm(cdm_id_);
 }
 
 void MojoCdmService::SetClient(mojo::ContentDecryptionModuleClientPtr client) {
   client_ = client.Pass();
 }
 
 void MojoCdmService::Initialize(
     const mojo::String& key_system,
     const mojo::String& security_origin,
+    mojo::CdmConfigPtr cdm_config,
     int32_t cdm_id,
     const mojo::Callback<void(mojo::CdmPromiseResultPtr)>& callback) {
   DVLOG(1) << __FUNCTION__ << ": " << key_system;
   DCHECK(!cdm_);
   DCHECK_NE(CdmContext::kInvalidCdmId, cdm_id);
 
   auto weak_this = weak_factory_.GetWeakPtr();
   cdm_factory_->Create(
-      key_system, GURL(security_origin), CdmConfig(),
+      key_system, GURL(security_origin), cdm_config.To<CdmConfig>(),
       base::Bind(&MojoCdmService::OnSessionMessage, weak_this),
       base::Bind(&MojoCdmService::OnSessionClosed, weak_this),
       base::Bind(&MojoCdmService::OnLegacySessionError, weak_this),
       base::Bind(&MojoCdmService::OnSessionKeysChange, weak_this),
       base::Bind(&MojoCdmService::OnSessionExpirationUpdate, weak_this),
       base::Bind(
           &MojoCdmService::OnCdmCreated, weak_this, cdm_id,
           base::Passed(make_scoped_ptr(new SimpleMojoCdmPromise(callback)))));
 }
 
-// mojo::MediaRenderer implementation.
 void MojoCdmService::SetServerCertificate(
     mojo::Array<uint8_t> certificate_data,
     const mojo::Callback<void(mojo::CdmPromiseResultPtr)>& callback) {
   DVLOG(2) << __FUNCTION__;
   cdm_->SetServerCertificate(
       certificate_data.storage(),
       make_scoped_ptr(new SimpleMojoCdmPromise(callback)));
 }
 
 void MojoCdmService::CreateSessionAndGenerateRequest(
@@ skipping 111 matching lines @@
                                           MediaKeys::Exception exception,
                                           uint32_t system_code,
                                           const std::string& error_message) {
   DVLOG(2) << __FUNCTION__;
   client_->OnLegacySessionError(session_id,
                                 static_cast<mojo::CdmException>(exception),
                                 system_code, error_message);
 }
 
 }  // namespace media