Add MediaKeys::GetCdmId().

content/renderer/media/crypto/render_cdm_factory.cc

Index: content/renderer/media/crypto/render_cdm_factory.cc
diff --git a/content/renderer/media/crypto/render_cdm_factory.cc b/content/renderer/media/crypto/render_cdm_factory.cc
index e029e67d37647e09e25279de73ed9fc344f69416..4e7829c049e6597e712b2de67a2d22391a698d99 100644
--- a/content/renderer/media/crypto/render_cdm_factory.cc
+++ b/content/renderer/media/crypto/render_cdm_factory.cc
@@ -13,7 +13,6 @@
 #include "content/renderer/media/crypto/ppapi_decryptor.h"
 #elif defined(ENABLE_BROWSER_CDMS)
 #include "content/renderer/media/crypto/proxy_media_keys.h"
-#include "content/renderer/media/crypto/renderer_cdm_manager.h"
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
 namespace content {
@@ -38,9 +37,6 @@ RenderCdmFactory::~RenderCdmFactory() {
 scoped_ptr<media::MediaKeys> RenderCdmFactory::Create(
     const std::string& key_system,
     const GURL& security_origin,
-#if defined(ENABLE_BROWSER_CDMS)
-    int* cdm_id,
-#endif
     const media::SessionMessageCB& session_message_cb,
     const media::SessionReadyCB& session_ready_cb,
     const media::SessionClosedCB& session_closed_cb,
@@ -52,10 +48,6 @@ scoped_ptr<media::MediaKeys> RenderCdmFactory::Create(
   // check the security origin before calling.
   // DCHECK(security_origin.is_valid());
 
-#if defined(ENABLE_BROWSER_CDMS)
-  *cdm_id = RendererCdmManager::kInvalidCdmId;
-#endif
-
   if (CanUseAesDecryptor(key_system)) {
     return scoped_ptr<media::MediaKeys>(new media::AesDecryptor(
         session_message_cb, session_closed_cb, session_keys_change_cb));
@@ -73,7 +65,7 @@ scoped_ptr<media::MediaKeys> RenderCdmFactory::Create(
                              session_keys_change_cb,
                              session_expiration_update_cb));
 #elif defined(ENABLE_BROWSER_CDMS)
-  scoped_ptr<ProxyMediaKeys> proxy_media_keys =
+  return scoped_ptr<ProxyMediaKeys>(

[jrummell, 2014/10/17 17:53:26]

Should this be media::MediaKeys like the other two? It looks like it doesn't
make any difference to the compilers, but it's not consistent.

[xhwang, 2014/10/17 20:32:06]

Good catch. Done.

       ProxyMediaKeys::Create(key_system,
                              security_origin,
                              manager_,
@@ -82,10 +74,7 @@ scoped_ptr<media::MediaKeys> RenderCdmFactory::Create(
                              session_closed_cb,
                              session_error_cb,
                              session_keys_change_cb,
-                             session_expiration_update_cb);
-  if (proxy_media_keys)
-    *cdm_id = proxy_media_keys->GetCdmId();
-  return proxy_media_keys.Pass();
+                             session_expiration_update_cb));
 #else
   return nullptr;
 #endif  // defined(ENABLE_PEPPER_CDMS)