Introduce CdmFactory interface.

content/renderer/media/crypto/proxy_decryptor.h

Index: content/renderer/media/crypto/proxy_decryptor.h
diff --git a/content/renderer/media/crypto/proxy_decryptor.h b/content/renderer/media/crypto/proxy_decryptor.h
index 66d402ec77f9ab1104cef35109a0b4a10cbb8df8..6fd41d583564cd1dffcb18224d9bc8e642c88b1d 100644
--- a/content/renderer/media/crypto/proxy_decryptor.h
+++ b/content/renderer/media/crypto/proxy_decryptor.h
@@ -12,13 +12,10 @@
 #include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "media/base/cdm_factory.h"
 #include "media/base/decryptor.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 {
@@ -46,15 +43,10 @@ class ProxyDecryptor {
                               const std::vector<uint8>& message,
                               const GURL& destination_url)> KeyMessageCB;
 
-  ProxyDecryptor(
-#if defined(ENABLE_PEPPER_CDMS)
-      const CreatePepperCdmCB& create_pepper_cdm_cb,
-#elif defined(ENABLE_BROWSER_CDMS)
-      RendererCdmManager* manager,
-#endif  // defined(ENABLE_PEPPER_CDMS)
-      const KeyAddedCB& key_added_cb,
-      const KeyErrorCB& key_error_cb,
-      const KeyMessageCB& key_message_cb);
+  ProxyDecryptor(scoped_ptr<media::CdmFactory> cdm_factory,
+                 const KeyAddedCB& key_added_cb,
+                 const KeyErrorCB& key_error_cb,
+                 const KeyMessageCB& key_message_cb);
   virtual ~ProxyDecryptor();
 
   // Returns the Decryptor associated with this object. May be NULL if no
@@ -110,13 +102,11 @@ class ProxyDecryptor {
   void SetSessionId(SessionCreationType session_type,
                     const std::string& web_session_id);
 
-#if defined(ENABLE_PEPPER_CDMS)
-  // Callback to create the Pepper plugin.
-  CreatePepperCdmCB create_pepper_cdm_cb_;
-#elif defined(ENABLE_BROWSER_CDMS)
-  RendererCdmManager* manager_;
+  scoped_ptr<media::CdmFactory> cdm_factory_;
+
+#if defined(ENABLE_BROWSER_CDMS)
   int cdm_id_;
-#endif  // defined(ENABLE_PEPPER_CDMS)
+#endif
 
   // The real MediaKeys that manages key operations for the ProxyDecryptor.
   scoped_ptr<media::MediaKeys> media_keys_;