Modify the PPAPI CDM interface to pass more info.

webkit/plugins/ppapi/ppapi_plugin_instance.h

Index: webkit/plugins/ppapi/ppapi_plugin_instance.h
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.h b/webkit/plugins/ppapi/ppapi_plugin_instance.h
index 1d00b3c0783462a15e2612862e646933f77a8384..89c5be1b2175dd52b6f6b48549a2ea746a8b618f 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.h
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h
@@ -53,6 +53,7 @@
 #include "webkit/plugins/ppapi/ppp_pdf.h"
 #include "webkit/plugins/webkit_plugins_export.h"
 
+struct PP_DecryptedBlockInfo;
 struct PP_Point;
 
 class SkBitmap;
@@ -245,7 +246,8 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance :
   bool GenerateKeyRequest(const std::string& key_system,
                           const std::string& init_data);
   bool AddKey(const std::string& session_id,
-              const std::string& key);
+              const std::string& key,
+              const std::string& init_data);
   bool CancelKeyRequest(const std::string& session_id);
   bool Decrypt(const base::StringPiece& encypted_block,
                const DecryptedDataCB& callback);
@@ -445,13 +447,13 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance :
                         int32_t system_code) OVERRIDE;
   virtual void DeliverBlock(PP_Instance instance,
                             PP_Resource decrypted_block,
-                            int32_t request_id) OVERRIDE;
+                            const PP_DecryptedBlockInfo* block_info) OVERRIDE;
   virtual void DeliverFrame(PP_Instance instance,
                             PP_Resource decrypted_frame,
-                            int32_t request_id) OVERRIDE;
+                            const PP_DecryptedBlockInfo* block_info) OVERRIDE;
   virtual void DeliverSamples(PP_Instance instance,
                               PP_Resource decrypted_samples,
-                              int32_t request_id) OVERRIDE;
+                              const PP_DecryptedBlockInfo* block_info) OVERRIDE;
 
   // Reset this instance as proxied. Resets cached interfaces to point to the
   // proxy and re-sends DidCreate, DidChangeView, and HandleDocumentLoad (if