media: Hook up ContentDecryptionModuleClient in mojo CDM service.

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_key_information.h"
 #include "media/base/cdm_promise.h"
@@ skipping 21 matching lines @@
                   result->system_code, result->error_message);
 }
 
 MojoCdm::MojoCdm(mojo::ContentDecryptionModulePtr remote_cdm,
                  const SessionMessageCB& session_message_cb,
                  const SessionClosedCB& session_closed_cb,
                  const SessionErrorCB& session_error_cb,
                  const SessionKeysChangeCB& session_keys_change_cb,
                  const SessionExpirationUpdateCB& session_expiration_update_cb)
     : remote_cdm_(remote_cdm.Pass()),
+      binding_(this),
       session_message_cb_(session_message_cb),
       session_closed_cb_(session_closed_cb),
       session_error_cb_(session_error_cb),
       session_keys_change_cb_(session_keys_change_cb),
       session_expiration_update_cb_(session_expiration_update_cb),
       weak_factory_(this) {
   DVLOG(1) << __FUNCTION__;
   DCHECK(!session_message_cb_.is_null());
   DCHECK(!session_closed_cb_.is_null());
   DCHECK(!session_error_cb_.is_null());
   DCHECK(!session_keys_change_cb_.is_null());
   DCHECK(!session_expiration_update_cb_.is_null());
 
-  // 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();
+  mojo::ContentDecryptionModuleClientPtr client_ptr;
+  binding_.Bind(GetProxy(&client_ptr));
+  remote_cdm_->SetClient(client_ptr.Pass());

[xhwang, 2015/03/17 23:30:37]

We don't need to wait for a confirmation callaback because all commands are
queued up in the pipe. Before the next command/call is handled, we must have
finished processing SetClient() on the service side.

 }
 
 MojoCdm::~MojoCdm() {
   DVLOG(1) << __FUNCTION__;
 }
 
 void MojoCdm::SetServerCertificate(const uint8_t* certificate_data,
                                    int certificate_data_length,
                                    scoped_ptr<SimpleCdmPromise> promise) {
   remote_cdm_->SetServerCertificate(
@@ skipping 97 matching lines @@
                               key_data.Pass());
 }
 
 void MojoCdm::OnSessionExpirationUpdate(const mojo::String& session_id,
                                         int64_t new_expiry_time_usec) {
   session_expiration_update_cb_.Run(
       session_id, base::Time::FromInternalValue(new_expiry_time_usec));
 }
 
 }  // namespace media