media: Hook up ContentDecryptionModuleClient in mojo CDM service.

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_key_information.h"
 #include "media/base/key_systems.h"
 #include "media/cdm/aes_decryptor.h"
 #include "media/mojo/services/media_type_converters.h"
 #include "media/mojo/services/mojo_cdm_promise.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/common/url_type_converters.h"
 
 namespace media {
 
 typedef MojoCdmPromise<> SimpleMojoCdmPromise;
 typedef MojoCdmPromise<std::string> NewSessionMojoCdmPromise;
 
 MojoCdmService::MojoCdmService(const mojo::String& key_system)
     : weak_factory_(this) {
   base::WeakPtr<MojoCdmService> weak_this = weak_factory_.GetWeakPtr();
 
-  // TODO(xhwang): Client syntax has been removed, so a new mechanism for client
-  // discovery must be added to this interface.  See http://crbug.com/451321.
-  NOTREACHED();
-
   if (CanUseAesDecryptor(key_system)) {
     cdm_.reset(new AesDecryptor(
         base::Bind(&MojoCdmService::OnSessionMessage, weak_this),
         base::Bind(&MojoCdmService::OnSessionClosed, weak_this),
         base::Bind(&MojoCdmService::OnSessionKeysChange, weak_this)));
   }
 
   // TODO(xhwang): Check key system support in the app.
   NOTREACHED();
 }
 
 MojoCdmService::~MojoCdmService() {
 }
 
+void MojoCdmService::SetClient(mojo::ContentDecryptionModuleClientPtr client) {
+  client_ = client.Pass();
+}
+
 // mojo::MediaRenderer implementation.
 void MojoCdmService::SetServerCertificate(
     mojo::Array<uint8_t> certificate_data,
     const mojo::Callback<void(mojo::CdmPromiseResultPtr)>& callback) {
   const std::vector<uint8_t>& certificate_data_vector =
       certificate_data.storage();
   cdm_->SetServerCertificate(
       certificate_data_vector.empty() ? nullptr : &certificate_data_vector[0],
       certificate_data_vector.size(),
       scoped_ptr<SimpleCdmPromise>(new SimpleMojoCdmPromise(callback)));
@@ skipping 93 matching lines @@
 void MojoCdmService::OnSessionError(const std::string& session_id,
                                     MediaKeys::Exception exception,
                                     uint32_t system_code,
                                     const std::string& error_message) {
   client_->OnSessionError(session_id,
                           static_cast<mojo::CdmException>(exception),
                           system_code, error_message);
 }
 
 }  // namespace media