Remove Client= syntax from mojo CDM implementations.

These interfaces are incomplete and have no users, so disable until
xhwang@ can determine the design for the non-client world.

BUG=451321
TEST=none

Review URL: https://codereview.chromium.org/884123008

Cr-Commit-Position: refs/heads/master@{#315637}

3 files changed, 22 insertions, 13 deletions

diff --git a/media/mojo/services/mojo_cdm.cc b/media/mojo/services/mojo_cdm.cc
index 88c5848..43dbf2d 100644
--- a/media/mojo/services/mojo_cdm.cc
+++ b/media/mojo/services/mojo_cdm.cc
@@ -52,7 +52,9 @@ MojoCdm::MojoCdm(mojo::ContentDecryptionModulePtr remote_cdm,
   DCHECK(!session_keys_change_cb_.is_null());
   DCHECK(!session_expiration_update_cb_.is_null());
 
-  remote_cdm_.set_client(this);
+  // 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();
 }
 
 MojoCdm::~MojoCdm() {
diff --git a/media/mojo/services/mojo_cdm_service.cc b/media/mojo/services/mojo_cdm_service.cc
index 17c3919..a9170c6 100644
--- a/media/mojo/services/mojo_cdm_service.cc
+++ b/media/mojo/services/mojo_cdm_service.cc
@@ -20,6 +20,11 @@ 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),
@@ -110,10 +115,10 @@ void MojoCdmService::OnSessionMessage(const std::string& session_id,
                                       MediaKeys::MessageType message_type,
                                       const std::vector<uint8_t>& message,
                                       const GURL& legacy_destination_url) {
-  client()->OnSessionMessage(session_id,
-                             static_cast<mojo::CdmMessageType>(message_type),
-                             mojo::Array<uint8_t>::From(message),
-                             mojo::String::From(legacy_destination_url));
+  client_->OnSessionMessage(session_id,
+                            static_cast<mojo::CdmMessageType>(message_type),
+                            mojo::Array<uint8_t>::From(message),
+                            mojo::String::From(legacy_destination_url));
 }
 
 void MojoCdmService::OnSessionKeysChange(const std::string& session_id,
@@ -122,28 +127,28 @@ void MojoCdmService::OnSessionKeysChange(const std::string& session_id,
   mojo::Array<mojo::CdmKeyInformationPtr> keys_data;
   for (const auto& key : keys_info)
     keys_data.push_back(mojo::CdmKeyInformation::From(*key));
-  client()->OnSessionKeysChange(session_id, has_additional_usable_key,
-                                keys_data.Pass());
+  client_->OnSessionKeysChange(session_id, has_additional_usable_key,
+                               keys_data.Pass());
 }
 
 void MojoCdmService::OnSessionExpirationUpdate(
     const std::string& session_id,
     const base::Time& new_expiry_time) {
-  client()->OnSessionExpirationUpdate(session_id,
-                                      new_expiry_time.ToInternalValue());
+  client_->OnSessionExpirationUpdate(session_id,
+                                     new_expiry_time.ToInternalValue());
 }
 
 void MojoCdmService::OnSessionClosed(const std::string& session_id) {
-  client()->OnSessionClosed(session_id);
+  client_->OnSessionClosed(session_id);
 }
 
 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);
+  client_->OnSessionError(session_id,
+                          static_cast<mojo::CdmException>(exception),
+                          system_code, error_message);
 }
 
 }  // namespace media
diff --git a/media/mojo/services/mojo_cdm_service.h b/media/mojo/services/mojo_cdm_service.h
index 4e84800..045c7c4 100644
--- a/media/mojo/services/mojo_cdm_service.h
+++ b/media/mojo/services/mojo_cdm_service.h
@@ -68,6 +68,8 @@ class MojoCdmService
 
   scoped_ptr<MediaKeys> cdm_;
 
+  mojo::ContentDecryptionModuleClientPtr client_;
+
   base::WeakPtr<MojoCdmService> weak_this_;
   base::WeakPtrFactory<MojoCdmService> weak_factory_;