media: Hook up ContentDecryptionModuleClient in mojo CDM service.

media/mojo/services/mojo_cdm_service.cc

Index: media/mojo/services/mojo_cdm_service.cc
diff --git a/media/mojo/services/mojo_cdm_service.cc b/media/mojo/services/mojo_cdm_service.cc
index d49a5c3354a6d1c9e4b33bd5571767fe443c3c60..c67897d78e6f9c3447adea68944034b33dc00288 100644
--- a/media/mojo/services/mojo_cdm_service.cc
+++ b/media/mojo/services/mojo_cdm_service.cc
@@ -22,10 +22,6 @@ 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),
@@ -40,6 +36,10 @@ MojoCdmService::MojoCdmService(const mojo::String& key_system)
 MojoCdmService::~MojoCdmService() {
 }
 
+void MojoCdmService::SetClient(mojo::ContentDecryptionModuleClientPtr client) {
+  client_ = client.Pass();
+}
+
 // mojo::MediaRenderer implementation.
 void MojoCdmService::SetServerCertificate(
     mojo::Array<uint8_t> certificate_data,