Introduce CdmFactory interface.

content/renderer/media/crypto/render_cdm_factory.cc

Index: content/renderer/media/crypto/render_cdm_factory.cc
diff --git a/content/renderer/media/crypto/content_decryption_module_factory.cc b/content/renderer/media/crypto/render_cdm_factory.cc
similarity index 79%
rename from content/renderer/media/crypto/content_decryption_module_factory.cc
rename to content/renderer/media/crypto/render_cdm_factory.cc
index 07302388d4531768fc42444d0c7efd7bd68c2970..defb44a89ef40804b1cec82490ac615b2e7f4c31 100644
--- a/content/renderer/media/crypto/content_decryption_module_factory.cc
+++ b/content/renderer/media/crypto/render_cdm_factory.cc
@@ -1,8 +1,8 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.

[ddorwin, 2014/10/16 17:32:52]

nit: I don't think we change this. Also, the .h was not changed.

[xhwang, 2014/10/16 20:08:39]

Reverted. 

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/renderer/media/crypto/content_decryption_module_factory.h"
+#include "content/renderer/media/crypto/render_cdm_factory.h"
 
 #include "base/logging.h"
 #include "content/renderer/media/crypto/key_systems.h"
@@ -18,39 +18,45 @@
 
 namespace content {
 
-scoped_ptr<media::MediaKeys> ContentDecryptionModuleFactory::Create(
-    const std::string& key_system,
-    const GURL& security_origin,
 #if defined(ENABLE_PEPPER_CDMS)
-    const CreatePepperCdmCB& create_pepper_cdm_cb,
+RenderCdmFactory::RenderCdmFactory(
+    const CreatePepperCdmCB& create_pepper_cdm_cb)
+    : create_pepper_cdm_cb_(create_pepper_cdm_cb) {
+}
 #elif defined(ENABLE_BROWSER_CDMS)
-    RendererCdmManager* manager,
-    int* cdm_id,
+RenderCdmFactory::RenderCdmFactory(RendererCdmManager* manager)
+    : manager_(manager) {
+}
+#else
+RenderCdmFactory::RenderCdmFactory() {
+}
 #endif  // defined(ENABLE_PEPPER_CDMS)
+
+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,
     const media::SessionErrorCB& session_error_cb,
     const media::SessionKeysChangeCB& session_keys_change_cb,
     const media::SessionExpirationUpdateCB& session_expiration_update_cb) {
-  // TODO(jrummell): Pass |security_origin| to all constructors.
-  // TODO(jrummell): Enable the following line once blink code updated to
-  // 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)) {

[ddorwin, 2014/10/16 17:32:52]

The TODOs are still valid, though you could address the second one. For the
first one, you can change it to make AesDecryptor take the origin.

[xhwang, 2014/10/16 20:08:39]

These are accidentally removed. Thanks for catching it.

     return scoped_ptr<media::MediaKeys>(new media::AesDecryptor(
         session_message_cb, session_closed_cb, session_keys_change_cb));
   }
+
 #if defined(ENABLE_PEPPER_CDMS)
   return scoped_ptr<media::MediaKeys>(
       PpapiDecryptor::Create(key_system,
                              security_origin,
-                             create_pepper_cdm_cb,
+                             create_pepper_cdm_cb_,
                              session_message_cb,
                              session_ready_cb,
                              session_closed_cb,
@@ -61,7 +67,7 @@ scoped_ptr<media::MediaKeys> ContentDecryptionModuleFactory::Create(
   scoped_ptr<ProxyMediaKeys> proxy_media_keys =
       ProxyMediaKeys::Create(key_system,
                              security_origin,
-                             manager,
+                             manager_,
                              session_message_cb,
                              session_ready_cb,
                              session_closed_cb,