Separate RendererCdmManager from RendererMediaPlayerManager.

content/renderer/media/crypto/content_decryption_module_factory.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_CONTENT_DECRYPTION_MODULE_FACTORY_H_
 #define CONTENT_RENDERER_MEDIA_CRYPTO_CONTENT_DECRYPTION_MODULE_FACTORY_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "media/base/media_keys.h"
 
 #if defined(ENABLE_PEPPER_CDMS)
 #include "content/renderer/media/crypto/pepper_cdm_wrapper.h"
 #endif
 
 class GURL;
 
 namespace content {
 
-class RendererMediaPlayerManager;
+class RendererCdmManager;
 
 class ContentDecryptionModuleFactory {
  public:
   // |create_pepper_cdm_cb| will be called synchronously if necessary. The other
   // callbacks can be called asynchronously.
   static scoped_ptr<media::MediaKeys> Create(
       const std::string& key_system,
       const GURL& security_origin,
 #if defined(ENABLE_PEPPER_CDMS)
       const CreatePepperCdmCB& create_pepper_cdm_cb,
 #elif defined(OS_ANDROID)
-      RendererMediaPlayerManager* manager,
+      RendererCdmManager* manager,

[ddorwin, 2014/05/23 23:28:37]

Step n: Unify these parameters? :)

[xhwang, 2014/05/27 22:57:41]

n++ :)

       int* cdm_id,  // Output parameter indicating the CDM ID of the MediaKeys.
 #endif  // defined(ENABLE_PEPPER_CDMS)
       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);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_CRYPTO_CONTENT_DECRYPTION_MODULE_FACTORY_H_