Introduce CdmFactory interface.

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 0773d410a668139f071d9f8a13140f3ce6ba9f59..1e6d9d4243a5c8955211c93a7eec5328d75197b7 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -73,6 +73,7 @@
 #include "content/renderer/manifest/manifest_manager.h"
 #include "content/renderer/media/audio_renderer_mixer_manager.h"
 #include "content/renderer/media/crypto/encrypted_media_player_support_impl.h"
+#include "content/renderer/media/crypto/render_cdm_factory.h"
 #include "content/renderer/media/media_stream_dispatcher.h"
 #include "content/renderer/media/media_stream_renderer_factory.h"
 #include "content/renderer/media/midi_dispatcher.h"
@@ -153,7 +154,9 @@
 #include "content/renderer/media/android/webmediaplayer_android.h"
 #endif
 
-#if defined(ENABLE_BROWSER_CDMS)
+#if defined(ENABLE_PEPPER_CDMS)
+#include "content/renderer/media/crypto/pepper_cdm_wrapper_impl.h"
+#elif defined(ENABLE_BROWSER_CDMS)
 #include "content/renderer/media/crypto/renderer_cdm_manager.h"
 #endif
 
@@ -1700,14 +1703,17 @@ RenderFrameImpl::createContentDecryptionModule(
     const blink::WebSecurityOrigin& security_origin,
     const blink::WebString& key_system) {
   DCHECK(!frame_ || frame_ == frame);
-  return WebContentDecryptionModuleImpl::Create(
+
+  scoped_ptr<media::CdmFactory> cdm_factory(new RenderCdmFactory(

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

ditto

[xhwang, 2014/10/17 20:09:22]

Done.

 #if defined(ENABLE_PEPPER_CDMS)
-      frame,
+      base::Bind(&PepperCdmWrapperImpl::Create, frame)
 #elif defined(ENABLE_BROWSER_CDMS)
-      GetCdmManager(),
+      GetCdmManager()
 #endif
-      security_origin,
-      key_system);
+  ));
+
+  return WebContentDecryptionModuleImpl::Create(
+      cdm_factory.get(), security_origin, key_system);
 }
 
 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost(