Encrypted Media: Implement IPC based SetCdm().

content/renderer/media/android/proxy_media_keys.cc

 // Copyright 2013 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 "content/renderer/media/android/proxy_media_keys.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "content/renderer/media/android/renderer_media_player_manager.h"
 #include "content/renderer/media/crypto/key_systems.h"
 
 namespace content {
 
 ProxyMediaKeys::ProxyMediaKeys(
     RendererMediaPlayerManager* manager,
     int cdm_id,
     const media::SessionCreatedCB& session_created_cb,
     const media::SessionMessageCB& session_message_cb,
     const media::SessionReadyCB& session_ready_cb,
     const media::SessionClosedCB& session_closed_cb,
     const media::SessionErrorCB& session_error_cb)
     : manager_(manager),
       cdm_id_(cdm_id),

[ddorwin, 2014/03/11 18:05:14]

Let's make this class responsible for initializing the CDM ID to a unique value
instead of putting that on the caller, which shouldn't care.

[xhwang, 2014/03/12 01:07:52]

Done.

       session_created_cb_(session_created_cb),
       session_message_cb_(session_message_cb),
       session_ready_cb_(session_ready_cb),
       session_closed_cb_(session_closed_cb),
       session_error_cb_(session_error_cb) {
   DCHECK(manager_);
+  DCHECK_NE(cdm_id, media::MediaKeys::kInvalidCdmId);
 }
 
 ProxyMediaKeys::~ProxyMediaKeys() {
   manager_->DestroyCdm(cdm_id_);
 }
 
 void ProxyMediaKeys::InitializeCdm(const std::string& key_system,
                                    const GURL& frame_url) {
   manager_->InitializeCdm(cdm_id_, this, key_system, frame_url);
 }
@@ skipping 37 matching lines @@
   manager_->UpdateSession(
       cdm_id_,
       session_id,
       std::vector<uint8>(response, response + response_length));
 }
 
 void ProxyMediaKeys::ReleaseSession(uint32 session_id) {
   manager_->ReleaseSession(cdm_id_, session_id);
 }
 
+int ProxyMediaKeys::GetCdmId() {
+  return cdm_id_;
+}
+
 void ProxyMediaKeys::OnSessionCreated(uint32 session_id,
                                       const std::string& web_session_id) {
   session_created_cb_.Run(session_id, web_session_id);
 }
 
 void ProxyMediaKeys::OnSessionMessage(uint32 session_id,
                                       const std::vector<uint8>& message,
                                       const std::string& destination_url) {
   session_message_cb_.Run(session_id, message, destination_url);
 }
 
 void ProxyMediaKeys::OnSessionReady(uint32 session_id) {
   session_ready_cb_.Run(session_id);
 }
 
 void ProxyMediaKeys::OnSessionClosed(uint32 session_id) {
   session_closed_cb_.Run(session_id);
 }
 
 void ProxyMediaKeys::OnSessionError(uint32 session_id,
                                     media::MediaKeys::KeyError error_code,
                                     uint32 system_code) {
   session_error_cb_.Run(session_id, error_code, system_code);
 }
 
 }  // namespace content