Support LoadSession() in MediaKeys and PPP_ContentDecryptor_Private interface.

- Add LoadSession() to all MediaKeys implementations.
- Add LoadSession() support in PPP_ContentDecryptor_Private stack.
- Move "LOAD_SESSION|" parsing code from CdmWrapper to ProxyDecryptor.
- Also update "type" parameter in CreateSession() to "content_type".

BUG=338831
TEST=LoadSession tests in browser_tests still pass.
R=dcheng@chromium.org, ddorwin@chromium.org, dmichael@chromium.org

Review URL: https://codereview.chromium.org/131653003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250769 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 25 insertions, 7 deletions

diff --git a/ppapi/api/private/ppp_content_decryptor_private.idl b/ppapi/api/private/ppp_content_decryptor_private.idl
index 71cda55..f6cd1f0 100644
--- a/ppapi/api/private/ppp_content_decryptor_private.idl
+++ b/ppapi/api/private/ppp_content_decryptor_private.idl
@@ -9,7 +9,7 @@
  * Decryption Modules, not normal plugins.
  */
 label Chrome {
-  M34 = 0.10
+  M34 = 0.11
 };
 
 /**
@@ -31,19 +31,18 @@ interface PPP_ContentDecryptor_Private {
       [in] PP_Var key_system);
 
   /**
-   * Creates a session. <code>type</code> contains the MIME type of
+   * Creates a session. <code>content_type</code> contains the MIME type of
    * <code>init_data</code>. <code>init_data</code> is a data buffer
    * containing data for use in generating the request.
    *
-   * Note: <code>CreateSession()</code> must create the session ID used in
-   * other methods on this interface. The session ID must be provided to the
-   * browser by the CDM via <code>SessionCreated()</code> on the
+   * Note: <code>CreateSession()</code> must create a web session ID and provide
+   * it to the browser via <code>SessionCreated()</code> on the
    * <code>PPB_ContentDecryptor_Private</code> interface.
    *
    * @param[in] session_id A reference for the session for which a session
    * should be generated.
    *
-   * @param[in] type A <code>PP_Var</code> of type
+   * @param[in] content_type A <code>PP_Var</code> of type
    * <code>PP_VARTYPE_STRING</code> containing the MIME type for init_data.
    *
    * @param[in] init_data A <code>PP_Var</code> of type
@@ -53,10 +52,29 @@ interface PPP_ContentDecryptor_Private {
   void CreateSession(
       [in] PP_Instance instance,
       [in] uint32_t session_id,
-      [in] PP_Var type,
+      [in] PP_Var content_type,
       [in] PP_Var init_data);
 
   /**
+   * Loads a session whose web session ID is <code>web_session_id</code>.
+   *
+   * Note: After the session is successfully loaded, the CDM must call
+   * <code>SessionCreated()</code> with <code>web_session_id</code> on the
+   * <code>PPB_ContentDecryptor_Private</code> interface.
+   *
+   * @param[in] session_id A reference for the session for which a session
+   * should be loaded.
+   *
+   * @param[in] web_session_id A <code>PP_Var</code> of type
+   * <code>PP_VARTYPE_STRING</code> containing the web session ID of the session
+   * to load.
+   */
+  void LoadSession(
+      [in] PP_Instance instance,
+      [in] uint32_t session_id,
+      [in] PP_Var web_session_id);
+
+  /**
    * Provides a license or other message to the decryptor.
    *
    * When the CDM needs more information, it must call