| Index: content/renderer/pepper/content_decryptor_delegate.cc
|
| diff --git a/content/renderer/pepper/content_decryptor_delegate.cc b/content/renderer/pepper/content_decryptor_delegate.cc
|
| index 26873ef9a9cdff7250cf19b0b140362f1f9b0a1a..f9747a091f38330c9303a782771bae5c45c2f62e 100644
|
| --- a/content/renderer/pepper/content_decryptor_delegate.cc
|
| +++ b/content/renderer/pepper/content_decryptor_delegate.cc
|
| @@ -286,20 +286,27 @@ void ContentDecryptorDelegate::InstanceCrashed() {
|
| }
|
|
|
| bool ContentDecryptorDelegate::CreateSession(uint32 session_id,
|
| - const std::string& type,
|
| + const std::string& content_type,
|
| const uint8* init_data,
|
| int init_data_length) {
|
| PP_Var init_data_array =
|
| PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar(
|
| init_data_length, init_data);
|
|
|
| - plugin_decryption_interface_->CreateSession(pp_instance_,
|
| - session_id,
|
| - StringVar::StringToPPVar(type),
|
| - init_data_array);
|
| + plugin_decryption_interface_->CreateSession(
|
| + pp_instance_,
|
| + session_id,
|
| + StringVar::StringToPPVar(content_type),
|
| + init_data_array);
|
| return true;
|
| }
|
|
|
| +void ContentDecryptorDelegate::LoadSession(uint32 session_id,
|
| + const std::string& web_session_id) {
|
| + plugin_decryption_interface_->LoadSession(
|
| + pp_instance_, session_id, StringVar::StringToPPVar(web_session_id));
|
| +}
|
| +
|
| bool ContentDecryptorDelegate::UpdateSession(uint32 session_id,
|
| const uint8* response,
|
| int response_length) {
|
|
|