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..37a9e7af63ecc3fe05c2ea66e798daa9aafcf1c1 100644 |
--- a/content/renderer/pepper/content_decryptor_delegate.cc |
+++ b/content/renderer/pepper/content_decryptor_delegate.cc |
@@ -286,17 +286,25 @@ 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; |
+} |
+ |
+bool ContentDecryptorDelegate::LoadSession(uint32 session_id, |
+ const std::string& web_session_id) { |
+ plugin_decryption_interface_->LoadSession( |
+ pp_instance_, session_id, StringVar::StringToPPVar(web_session_id)); |
return true; |
} |