Separate RendererCdmManager from RendererMediaPlayerManager.

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"
+#include "content/renderer/media/crypto/renderer_cdm_manager.h"
 
 namespace content {
 
-int ProxyMediaKeys::next_cdm_id_ =
-    RendererMediaPlayerManager::kInvalidCdmId + 1;
+int ProxyMediaKeys::next_cdm_id_ = RendererCdmManager::kInvalidCdmId + 1;
 
 scoped_ptr<ProxyMediaKeys> ProxyMediaKeys::Create(
     const std::string& key_system,
     const GURL& security_origin,
-    RendererMediaPlayerManager* manager,
+    RendererCdmManager* manager,
     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) {
   DCHECK(manager);
   scoped_ptr<ProxyMediaKeys> proxy_media_keys(
       new ProxyMediaKeys(manager,
                          session_created_cb,
                          session_message_cb,
@@ skipping 77 matching lines @@
                                     media::MediaKeys::KeyError error_code,
                                     uint32 system_code) {
   session_error_cb_.Run(session_id, error_code, system_code);
 }
 
 int ProxyMediaKeys::GetCdmId() const {
   return cdm_id_;
 }
 
 ProxyMediaKeys::ProxyMediaKeys(
-    RendererMediaPlayerManager* manager,
+    RendererCdmManager* manager,
     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_(next_cdm_id_++),

[damienv1, 2014/05/28 13:44:52]

The CDM id should be initialized and generated by the CDM manager (as part of a
regular member variable).
I don't think you should need a static "next_cdm_id_".

[xhwang, 2014/05/28 21:17:09]

Agreed. I'll do it in a separate CL.

       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) {
 }
 
 void ProxyMediaKeys::InitializeCdm(const std::string& key_system,
                                    const GURL& security_origin) {
   manager_->InitializeCdm(cdm_id_, this, key_system, security_origin);
 }
 
 }  // namespace content