Add PpapiDecryptor which wraps a CDM plugin.

webkit/media/crypto/key_systems.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_MEDIA_CRYPTO_KEY_SYSTEMS_H_
 #define WEBKIT_MEDIA_CRYPTO_KEY_SYSTEMS_H_
 
 #include <string>
 #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;
 }
 
 namespace media {
 class Decryptor;
 class DecryptorClient;
 }
 
 namespace webkit_media {
 
 // Returns whether |key_sytem| is supported at all.
 // Call IsSupportedKeySystemWithMediaMimeType() to determine whether a
 // |key_system| supports a specific type of media.
 bool IsSupportedKeySystem(const WebKit::WebString& key_system);
 
 // Returns whether |key_sytem| supports the specified media type and codec(s).
 bool IsSupportedKeySystemWithMediaMimeType(
     const std::string& mime_type,
     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
 
 #endif  // WEBKIT_MEDIA_CRYPTO_KEY_SYSTEMS_H_