media: Pass CdmConfig in mojo CDM interface.

media/mojo/services/mojo_cdm.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.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "media/base/cdm_context.h"
 #include "media/base/cdm_key_information.h"
@@ skipping 69 matching lines @@
   binding_.Bind(GetProxy(&client_ptr));
   remote_cdm_->SetClient(client_ptr.Pass());
 }
 
 MojoCdm::~MojoCdm() {
   DVLOG(1) << __FUNCTION__;
 }
 
 void MojoCdm::InitializeCdm(const std::string& key_system,
                             const GURL& security_origin,
-                            const media::CdmConfig& /* cdm_config */,
+                            const media::CdmConfig& cdm_config,
                             scoped_ptr<CdmInitializedPromise> promise) {
   DVLOG(1) << __FUNCTION__ << ": " << key_system;
-  // TODO(xhwang): Pass |cdm_config| down.
   remote_cdm_->Initialize(
-      key_system, security_origin.spec(), cdm_id_,
-      base::Bind(&MojoCdm::OnPromiseResult<>, weak_factory_.GetWeakPtr(),
-                 base::Passed(&promise)));
+      key_system, security_origin.spec(), mojo::CdmConfig::From(cdm_config),
+      cdm_id_, base::Bind(&MojoCdm::OnPromiseResult<>,
+                          weak_factory_.GetWeakPtr(), base::Passed(&promise)));
 }
 
 void MojoCdm::SetServerCertificate(const std::vector<uint8_t>& certificate,
                                    scoped_ptr<SimpleCdmPromise> promise) {
   DVLOG(2) << __FUNCTION__;
   remote_cdm_->SetServerCertificate(
       mojo::Array<uint8_t>::From(certificate),
       base::Bind(&MojoCdm::OnPromiseResult<>, weak_factory_.GetWeakPtr(),
                  base::Passed(&promise)));
 }
@@ skipping 112 matching lines @@
 }
 
 void MojoCdm::OnSessionExpirationUpdate(const mojo::String& session_id,
                                         double new_expiry_time_sec) {
   DVLOG(2) << __FUNCTION__;
   session_expiration_update_cb_.Run(
       session_id, base::Time::FromDoubleT(new_expiry_time_sec));
 }
 
 }  // namespace media