Changes to support CDM_7

ppapi/proxy/ppp_content_decryptor_private_proxy.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 PPAPI_PROXY_PPP_CONTENT_DECRYPTOR_PRIVATE_PROXY_H_
 #define PPAPI_PROXY_PPP_CONTENT_DECRYPTOR_PRIVATE_PROXY_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 18 matching lines @@
  private:
   // InterfaceProxy implementation.
   virtual bool OnMessageReceived(const IPC::Message& msg);
 
   // Message handlers.
   void OnMsgInitialize(PP_Instance instance,
                        SerializedVarReceiveInput key_system);
   void OnMsgSetServerCertificate(PP_Instance instance,
                                  uint32_t promise_id,
                                  std::vector<uint8_t> server_certificate);
-  void OnMsgCreateSession(PP_Instance instance,
-                          uint32_t promise_id,
-                          SerializedVarReceiveInput init_data_type,
-                          SerializedVarReceiveInput init_data,
-                          PP_SessionType session_type);
+  void OnMsgCreateSessionAndGenerateRequest(
+      PP_Instance instance,
+      uint32_t promise_id,
+      PP_SessionType session_type,
+      SerializedVarReceiveInput init_data_type,
+      SerializedVarReceiveInput init_data);
   void OnMsgLoadSession(PP_Instance instance,
                         uint32_t promise_id,
+                        PP_SessionType session_type,
                         SerializedVarReceiveInput web_session_id);
   void OnMsgUpdateSession(PP_Instance instance,
                           uint32_t promise_id,
                           SerializedVarReceiveInput web_session_id,
                           SerializedVarReceiveInput response);
   void OnMsgCloseSession(PP_Instance instance,
                          uint32_t promise_id,
                          const std::string& web_session_id);
   void OnMsgRemoveSession(PP_Instance instance,
                           uint32_t promise_id,
                           const std::string& web_session_id);
-  void OnMsgGetUsableKeyIds(PP_Instance instance,
-                            uint32_t promise_id,
-                            const std::string& web_session_id);
   void OnMsgDecrypt(PP_Instance instance,
                     const PPPDecryptor_Buffer& encrypted_buffer,
                     const std::string& serialized_encrypted_block_info);
   void OnMsgInitializeAudioDecoder(
       PP_Instance instance,
       const std::string& decoder_config,
       const PPPDecryptor_Buffer& extra_data_buffer);
   void OnMsgInitializeVideoDecoder(
       PP_Instance instance,
       const std::string& decoder_config,
@@ skipping 12 matching lines @@
 
   const PPP_ContentDecryptor_Private* ppp_decryptor_impl_;
 
   DISALLOW_COPY_AND_ASSIGN(PPP_ContentDecryptor_Private_Proxy);
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
 #endif  // PPAPI_PROXY_PPP_CONTENT_DECRYPTOR_PRIVATE_PROXY_H_