| Index: webkit/plugins/ppapi/ppapi_plugin_instance.cc
|
| diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
|
| index 6a2a3fe82f44632c9af840e9970c831fb20d939f..600fc44f87dc78d3f9e5d2b59cf094c628aa2d2f 100644
|
| --- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc
|
| +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
|
| @@ -1466,10 +1466,11 @@ bool PluginInstance::GenerateKeyRequest(const std::string& key_system,
|
| PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar(
|
| init_data.size(), init_data.data());
|
|
|
| - return PP_ToBool(plugin_decryption_interface_->GenerateKeyRequest(
|
| + plugin_decryption_interface_->GenerateKeyRequest(
|
| pp_instance(),
|
| StringVar::StringToPPVar(key_system),
|
| - init_data_array));
|
| + init_data_array);
|
| + return true;
|
| }
|
|
|
| bool PluginInstance::AddKey(const std::string& session_id,
|
| @@ -1485,20 +1486,21 @@ bool PluginInstance::AddKey(const std::string& session_id,
|
| init_data.size(),
|
| init_data.data());
|
|
|
| - return PP_ToBool(plugin_decryption_interface_->AddKey(
|
| + plugin_decryption_interface_->AddKey(
|
| pp_instance(),
|
| StringVar::StringToPPVar(session_id),
|
| key_array,
|
| - init_data_array));
|
| + init_data_array);
|
| + return true;
|
| }
|
|
|
| bool PluginInstance::CancelKeyRequest(const std::string& session_id) {
|
| if (!LoadContentDecryptorInterface())
|
| return false;
|
| -
|
| - return PP_ToBool(plugin_decryption_interface_->CancelKeyRequest(
|
| + plugin_decryption_interface_->CancelKeyRequest(
|
| pp_instance(),
|
| - StringVar::StringToPPVar(session_id)));
|
| + StringVar::StringToPPVar(session_id));
|
| + return true;
|
| }
|
|
|
| bool PluginInstance::Decrypt(
|
| @@ -1529,9 +1531,10 @@ bool PluginInstance::Decrypt(
|
| DCHECK(!ContainsKey(pending_decryption_cbs_, request_id));
|
| pending_decryption_cbs_.insert(std::make_pair(request_id, decrypt_cb));
|
|
|
| - return PP_ToBool(plugin_decryption_interface_->Decrypt(pp_instance(),
|
| - encrypted_resource,
|
| - &block_info));
|
| + plugin_decryption_interface_->Decrypt(pp_instance(),
|
| + encrypted_resource,
|
| + &block_info);
|
| + return true;
|
| }
|
|
|
| bool PluginInstance::DecryptAndDecode(
|
| @@ -1550,10 +1553,10 @@ bool PluginInstance::DecryptAndDecode(
|
| PP_EncryptedBlockInfo block_info;
|
|
|
| // TODO(tomfinegan): Store callback and ID in a map, and pass ID to decryptor.
|
| - return PP_ToBool(
|
| - plugin_decryption_interface_->DecryptAndDecode(pp_instance(),
|
| - encrypted_resource,
|
| - &block_info));
|
| + plugin_decryption_interface_->DecryptAndDecode(pp_instance(),
|
| + encrypted_resource,
|
| + &block_info);
|
| + return true;
|
| }
|
|
|
| bool PluginInstance::FlashIsFullscreenOrPending() {
|
|
|