| Index: ppapi/proxy/ppp_content_decryptor_private_proxy.cc
|
| diff --git a/ppapi/proxy/ppp_content_decryptor_private_proxy.cc b/ppapi/proxy/ppp_content_decryptor_private_proxy.cc
|
| index 329714bb79b2224e45ebfd361642dc5164da29f5..35c872517c849ad260caa1aa1372a228c02d94a5 100644
|
| --- a/ppapi/proxy/ppp_content_decryptor_private_proxy.cc
|
| +++ b/ppapi/proxy/ppp_content_decryptor_private_proxy.cc
|
| @@ -112,7 +112,9 @@ bool InitializePppDecryptorBuffer(PP_Instance instance,
|
| }
|
|
|
| void Initialize(PP_Instance instance,
|
| - PP_Var key_system) {
|
| + PP_Var key_system,
|
| + PP_Bool allow_distinctive_identifier,
|
| + PP_Bool allow_persistent_state) {
|
| HostDispatcher* dispatcher = HostDispatcher::GetForInstance(instance);
|
| if (!dispatcher) {
|
| NOTREACHED();
|
| @@ -123,7 +125,9 @@ void Initialize(PP_Instance instance,
|
| new PpapiMsg_PPPContentDecryptor_Initialize(
|
| API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE,
|
| instance,
|
| - SerializedVarSendInput(dispatcher, key_system)));
|
| + SerializedVarSendInput(dispatcher, key_system),
|
| + allow_distinctive_identifier,
|
| + allow_persistent_state));
|
| }
|
|
|
| void SetServerCertificate(PP_Instance instance,
|
| @@ -520,12 +524,16 @@ bool PPP_ContentDecryptor_Private_Proxy::OnMessageReceived(
|
|
|
| void PPP_ContentDecryptor_Private_Proxy::OnMsgInitialize(
|
| PP_Instance instance,
|
| - SerializedVarReceiveInput key_system) {
|
| + SerializedVarReceiveInput key_system,
|
| + PP_Bool allow_distinctive_identifier,
|
| + PP_Bool allow_persistent_state) {
|
| if (ppp_decryptor_impl_) {
|
| CallWhileUnlocked(
|
| ppp_decryptor_impl_->Initialize,
|
| instance,
|
| - ExtractReceivedVarAndAddRef(dispatcher(), &key_system));
|
| + ExtractReceivedVarAndAddRef(dispatcher(), &key_system),
|
| + allow_distinctive_identifier,
|
| + allow_persistent_state);
|
| }
|
| }
|
|
|
|
|