Introduce CdmFactory interface.

content/renderer/media/webcontentdecryptionmodule_impl.h

Index: content/renderer/media/webcontentdecryptionmodule_impl.h
diff --git a/content/renderer/media/webcontentdecryptionmodule_impl.h b/content/renderer/media/webcontentdecryptionmodule_impl.h
index fd724a69f814917c42b6b0f75ec792b28b5fe660..416ac4094263ad32cb692fc4c3924971a41a66b4 100644
--- a/content/renderer/media/webcontentdecryptionmodule_impl.h
+++ b/content/renderer/media/webcontentdecryptionmodule_impl.h
@@ -5,11 +5,10 @@
 #ifndef CONTENT_RENDERER_MEDIA_WEBCONTENTDECRYPTIONMODULE_IMPL_H_
 #define CONTENT_RENDERER_MEDIA_WEBCONTENTDECRYPTIONMODULE_IMPL_H_
 
-#include <string>
-
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
+#include "media/base/cdm_factory.h"

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

Can both of these be fwd declared?

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

When using scoped_ptr we can't. Now I am passing by ref and we can now!

 #include "third_party/WebKit/public/platform/WebContentDecryptionModule.h"
 
 namespace blink {
@@ -27,20 +26,13 @@ class MediaKeys;
 namespace content {
 
 class CdmSessionAdapter;
-#if defined(ENABLE_BROWSER_CDMS)
-class RendererCdmManager;
-#endif
 class WebContentDecryptionModuleSessionImpl;
 
 class WebContentDecryptionModuleImpl
     : public blink::WebContentDecryptionModule {
  public:
   static WebContentDecryptionModuleImpl* Create(
-#if defined(ENABLE_PEPPER_CDMS)
-      blink::WebLocalFrame* frame,
-#elif defined(ENABLE_BROWSER_CDMS)
-      RendererCdmManager* manager,
-#endif
+      scoped_ptr<media::CdmFactory> cdm_factory,
       const blink::WebSecurityOrigin& security_origin,
       const base::string16& key_system);