Add PpapiDecryptor which wraps a CDM plugin.

webkit/media/crypto/key_systems.h

Index: webkit/media/crypto/key_systems.h
diff --git a/webkit/media/crypto/key_systems.h b/webkit/media/crypto/key_systems.h
index 1822507818f11c5510d711a46ed83c3d186ae969..05668e901d0e91c008aec72e925798f7b924f3d3 100644
--- a/webkit/media/crypto/key_systems.h
+++ b/webkit/media/crypto/key_systems.h
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
+#include "webkit/plugins/ppapi/ppapi_plugin_instance.h"

[ddorwin, 2012/07/17 21:31:28]

We should really try to avoid this include in this header. It leaks to other
code that shouldn't care about ppapi.

[xhwang, 2012/07/18 19:43:17]

Done.

 
 namespace WebKit {
 class WebString;
@@ -32,10 +33,16 @@ bool IsSupportedKeySystemWithMediaMimeType(
     const std::vector<std::string>& codecs,
     const std::string& key_system);
 
+const char* GetPluginName(const std::string& key_system);

[ddorwin, 2012/07/17 21:31:28]

I think it is really PluginMimeType.

[xhwang, 2012/07/18 19:43:17]

Done.

+
 // Creates and returns a decryptor that corresponds to the |key_system|.
 // Returns NULL if the |key_system| is not supported.
-scoped_ptr<media::Decryptor> CreateDecryptor(const std::string& key_system,
-                                             media::DecryptorClient* client);
+typedef base::Callback<scoped_refptr<webkit::ppapi::PluginInstance>

[ddorwin, 2012/07/17 21:31:28]

Why is there a PI exposed? Seems wrong for this file to know about PIs.

[xhwang, 2012/07/18 19:43:17]

Done.

+                       (const std::string&)> CreatePluginCB;
+scoped_ptr<media::Decryptor> CreateDecryptor(
+    const std::string& key_system,
+    media::DecryptorClient* client,
+    const CreatePluginCB& create_plugin_cb);
 
 }  // namespace webkit_media