media: Rename WebSessionId to SessionId.

Web session ID was introduced when we also have integer session IDs. Now we
have removed integer session IDs and we don't need the "web" prefix any more.

TEST=Renaming only.

Review URL: https://codereview.chromium.org/858313002

Cr-Commit-Position: refs/heads/master@{#312661}

5 files changed, 101 insertions, 120 deletions

diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h
index 7921f59..d23a077 100644
--- a/ppapi/proxy/ppapi_messages.h
+++ b/ppapi/proxy/ppapi_messages.h
@@ -785,20 +785,20 @@ IPC_MESSAGE_ROUTED4(PpapiMsg_PPPContentDecryptor_LoadSession,
                     PP_Instance /* instance */,
                     uint32_t /* promise_id */,
                     PP_SessionType /* session_type */,
-                    ppapi::proxy::SerializedVar /* web_session_id, String */)
+                    ppapi::proxy::SerializedVar /* session_id, String */)
 IPC_MESSAGE_ROUTED4(PpapiMsg_PPPContentDecryptor_UpdateSession,
                     PP_Instance /* instance */,
                     uint32_t /* promise_id */,
-                    ppapi::proxy::SerializedVar /* web_session_id, String */,
+                    ppapi::proxy::SerializedVar /* session_id, String */,
                     ppapi::proxy::SerializedVar /* response, ArrayBuffer */)
 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_CloseSession,
                     PP_Instance /* instance */,
                     uint32_t /* promise_id */,
-                    std::string /* web_session_id */)
+                    std::string /* session_id */)
 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_RemoveSession,
                     PP_Instance /* instance */,
                     uint32_t /* promise_id */,
-                    std::string /* web_session_id */)
+                    std::string /* session_id */)
 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_Decrypt,
                     PP_Instance /* instance */,
                     ppapi::proxy::PPPDecryptor_Buffer /* buffer */,
@@ -1118,7 +1118,7 @@ IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBInstance_PromiseResolved,
 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_PromiseResolvedWithSession,
                     PP_Instance /* instance */,
                     uint32_t /* promise_id */,
-                    ppapi::proxy::SerializedVar /* web_session_id, String */)
+                    ppapi::proxy::SerializedVar /* session_id, String */)
 IPC_MESSAGE_ROUTED5(PpapiHostMsg_PPBInstance_PromiseRejected,
                     PP_Instance /* instance */,
                     uint32_t /* promise_id */,
@@ -1127,25 +1127,25 @@ IPC_MESSAGE_ROUTED5(PpapiHostMsg_PPBInstance_PromiseRejected,
                     ppapi::proxy::SerializedVar /* error_description, String */)
 IPC_MESSAGE_ROUTED5(PpapiHostMsg_PPBInstance_SessionMessage,
                     PP_Instance /* instance */,
-                    ppapi::proxy::SerializedVar /* web_session_id, String */,
+                    ppapi::proxy::SerializedVar /* session_id, String */,
                     PP_CdmMessageType /* message_type */,
                     ppapi::proxy::SerializedVar /* message, ArrayBuffer */,
                     ppapi::proxy::SerializedVar /* destination_url, String */)
 IPC_MESSAGE_ROUTED4(PpapiHostMsg_PPBInstance_SessionKeysChange,
                     PP_Instance /* instance */,
-                    std::string /* web_session_id */,
+                    std::string /* session_id */,
                     PP_Bool /* has_additional_usable_key */,
                     std::vector<PP_KeyInformation> /* key_information */)
 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_SessionExpirationChange,
                     PP_Instance /* instance */,
-                    std::string /* web_session_id */,
+                    std::string /* session_id */,
                     PP_Time /* new_expiry_time */)
 IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBInstance_SessionClosed,
                     PP_Instance /* instance */,
-                    ppapi::proxy::SerializedVar /* web_session_id, String */)
+                    ppapi::proxy::SerializedVar /* session_id, String */)
 IPC_MESSAGE_ROUTED5(PpapiHostMsg_PPBInstance_SessionError,
                     PP_Instance /* instance */,
-                    ppapi::proxy::SerializedVar /* web_session_id, String */,
+                    ppapi::proxy::SerializedVar /* session_id, String */,
                     PP_CdmExceptionCode /* exception_code */,
                     int32_t /* system_code */,
                     ppapi::proxy::SerializedVar /* error_description, String */)
diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc
index 31cdb04..f8b8ac9 100644
--- a/ppapi/proxy/ppb_instance_proxy.cc
+++ b/ppapi/proxy/ppb_instance_proxy.cc
@@ -575,12 +575,10 @@ void PPB_Instance_Proxy::PromiseResolved(PP_Instance instance,
 
 void PPB_Instance_Proxy::PromiseResolvedWithSession(PP_Instance instance,
                                                     uint32 promise_id,
-                                                    PP_Var web_session_id_var) {
+                                                    PP_Var session_id_var) {
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_PromiseResolvedWithSession(
-      API_ID_PPB_INSTANCE,
-      instance,
-      promise_id,
-      SerializedVarSendInput(dispatcher(), web_session_id_var)));
+      API_ID_PPB_INSTANCE, instance, promise_id,
+      SerializedVarSendInput(dispatcher(), session_id_var)));
 }
 
 void PPB_Instance_Proxy::PromiseRejected(PP_Instance instance,
@@ -598,26 +596,26 @@ void PPB_Instance_Proxy::PromiseRejected(PP_Instance instance,
 }
 
 void PPB_Instance_Proxy::SessionMessage(PP_Instance instance,
-                                        PP_Var web_session_id_var,
+                                        PP_Var session_id_var,
                                         PP_CdmMessageType message_type,
                                         PP_Var message_var,
                                         PP_Var legacy_destination_url_var) {
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_SessionMessage(
       API_ID_PPB_INSTANCE, instance,
-      SerializedVarSendInput(dispatcher(), web_session_id_var), message_type,
+      SerializedVarSendInput(dispatcher(), session_id_var), message_type,
       SerializedVarSendInput(dispatcher(), message_var),
       SerializedVarSendInput(dispatcher(), legacy_destination_url_var)));
 }
 
 void PPB_Instance_Proxy::SessionKeysChange(
     PP_Instance instance,
-    PP_Var web_session_id_var,
+    PP_Var session_id_var,
     PP_Bool has_additional_usable_key,
     uint32_t key_count,
     const struct PP_KeyInformation key_information[]) {
-  StringVar* session_id = StringVar::FromPPVar(web_session_id_var);
+  StringVar* session_id = StringVar::FromPPVar(session_id_var);
   if (!session_id ||
-      session_id->value().length() > media::limits::kMaxWebSessionIdLength) {
+      session_id->value().length() > media::limits::kMaxSessionIdLength) {
     NOTREACHED();
     return;
   }
@@ -635,11 +633,11 @@ void PPB_Instance_Proxy::SessionKeysChange(
 }
 
 void PPB_Instance_Proxy::SessionExpirationChange(PP_Instance instance,
-                                                 PP_Var web_session_id_var,
+                                                 PP_Var session_id_var,
                                                  PP_Time new_expiry_time) {
-  StringVar* session_id = StringVar::FromPPVar(web_session_id_var);
+  StringVar* session_id = StringVar::FromPPVar(session_id_var);
   if (!session_id ||
-      session_id->value().length() > media::limits::kMaxWebSessionIdLength) {
+      session_id->value().length() > media::limits::kMaxSessionIdLength) {
     NOTREACHED();
     return;
   }
@@ -649,23 +647,20 @@ void PPB_Instance_Proxy::SessionExpirationChange(PP_Instance instance,
 }
 
 void PPB_Instance_Proxy::SessionClosed(PP_Instance instance,
-                                       PP_Var web_session_id_var) {
+                                       PP_Var session_id_var) {
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_SessionClosed(
-      API_ID_PPB_INSTANCE,
-      instance,
-      SerializedVarSendInput(dispatcher(), web_session_id_var)));
+      API_ID_PPB_INSTANCE, instance,
+      SerializedVarSendInput(dispatcher(), session_id_var)));
 }
 
 void PPB_Instance_Proxy::SessionError(PP_Instance instance,
-                                      PP_Var web_session_id_var,
+                                      PP_Var session_id_var,
                                       PP_CdmExceptionCode exception_code,
                                       uint32 system_code,
                                       PP_Var error_description_var) {
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_SessionError(
-      API_ID_PPB_INSTANCE,
-      instance,
-      SerializedVarSendInput(dispatcher(), web_session_id_var),
-      exception_code,
+      API_ID_PPB_INSTANCE, instance,
+      SerializedVarSendInput(dispatcher(), session_id_var), exception_code,
       system_code,
       SerializedVarSendInput(dispatcher(), error_description_var)));
 }
@@ -1244,13 +1239,13 @@ void PPB_Instance_Proxy::OnHostMsgPromiseResolved(PP_Instance instance,
 void PPB_Instance_Proxy::OnHostMsgPromiseResolvedWithSession(
     PP_Instance instance,
     uint32_t promise_id,
-    SerializedVarReceiveInput web_session_id) {
+    SerializedVarReceiveInput session_id) {
   if (!dispatcher()->permissions().HasPermission(PERMISSION_PRIVATE))
     return;
   EnterInstanceNoLock enter(instance);
   if (enter.succeeded()) {
-    enter.functions()->PromiseResolvedWithSession(
-        instance, promise_id, web_session_id.Get(dispatcher()));
+    enter.functions()->PromiseResolvedWithSession(instance, promise_id,
+                                                  session_id.Get(dispatcher()));
   }
 }
 
@@ -1274,7 +1269,7 @@ void PPB_Instance_Proxy::OnHostMsgPromiseRejected(
 
 void PPB_Instance_Proxy::OnHostMsgSessionMessage(
     PP_Instance instance,
-    SerializedVarReceiveInput web_session_id,
+    SerializedVarReceiveInput session_id,
     PP_CdmMessageType message_type,
     SerializedVarReceiveInput message,
     SerializedVarReceiveInput legacy_destination_url) {
@@ -1282,15 +1277,15 @@ void PPB_Instance_Proxy::OnHostMsgSessionMessage(
     return;
   EnterInstanceNoLock enter(instance);
   if (enter.succeeded()) {
-    enter.functions()->SessionMessage(
-        instance, web_session_id.Get(dispatcher()), message_type,
-        message.Get(dispatcher()), legacy_destination_url.Get(dispatcher()));
+    enter.functions()->SessionMessage(instance, session_id.Get(dispatcher()),
+                                      message_type, message.Get(dispatcher()),
+                                      legacy_destination_url.Get(dispatcher()));
   }
 }
 
 void PPB_Instance_Proxy::OnHostMsgSessionKeysChange(
     PP_Instance instance,
-    const std::string& web_session_id,
+    const std::string& session_id,
     PP_Bool has_additional_usable_key,
     const std::vector<PP_KeyInformation>& key_information) {
   if (!dispatcher()->permissions().HasPermission(PERMISSION_PRIVATE))
@@ -1303,44 +1298,43 @@ void PPB_Instance_Proxy::OnHostMsgSessionKeysChange(
 
   EnterInstanceNoLock enter(instance);
   if (enter.succeeded()) {
-    ScopedPPVar web_session_id_var(ScopedPPVar::PassRef(),
-                                   StringVar::StringToPPVar(web_session_id));
+    ScopedPPVar session_id_var(ScopedPPVar::PassRef(),
+                               StringVar::StringToPPVar(session_id));
     enter.functions()->SessionKeysChange(
-        instance, web_session_id_var.get(), has_additional_usable_key,
+        instance, session_id_var.get(), has_additional_usable_key,
         key_information.size(), vector_as_array(&key_information));
   }
 }
 
 void PPB_Instance_Proxy::OnHostMsgSessionExpirationChange(
     PP_Instance instance,
-    const std::string& web_session_id,
+    const std::string& session_id,
     PP_Time new_expiry_time) {
   if (!dispatcher()->permissions().HasPermission(PERMISSION_PRIVATE))
     return;
   EnterInstanceNoLock enter(instance);
   if (enter.succeeded()) {
-    ScopedPPVar web_session_id_var(ScopedPPVar::PassRef(),
-                                   StringVar::StringToPPVar(web_session_id));
-    enter.functions()->SessionExpirationChange(
-        instance, web_session_id_var.get(), new_expiry_time);
+    ScopedPPVar session_id_var(ScopedPPVar::PassRef(),
+                               StringVar::StringToPPVar(session_id));
+    enter.functions()->SessionExpirationChange(instance, session_id_var.get(),
+                                               new_expiry_time);
   }
 }
 
 void PPB_Instance_Proxy::OnHostMsgSessionClosed(
     PP_Instance instance,
-    SerializedVarReceiveInput web_session_id) {
+    SerializedVarReceiveInput session_id) {
   if (!dispatcher()->permissions().HasPermission(PERMISSION_PRIVATE))
     return;
   EnterInstanceNoLock enter(instance);
   if (enter.succeeded()) {
-    enter.functions()->SessionClosed(instance,
-                                     web_session_id.Get(dispatcher()));
+    enter.functions()->SessionClosed(instance, session_id.Get(dispatcher()));
   }
 }
 
 void PPB_Instance_Proxy::OnHostMsgSessionError(
     PP_Instance instance,
-    SerializedVarReceiveInput web_session_id,
+    SerializedVarReceiveInput session_id,
     PP_CdmExceptionCode exception_code,
     uint32_t system_code,
     SerializedVarReceiveInput error_description) {
@@ -1348,10 +1342,8 @@ void PPB_Instance_Proxy::OnHostMsgSessionError(
     return;
   EnterInstanceNoLock enter(instance);
   if (enter.succeeded()) {
-    enter.functions()->SessionError(instance,
-                                    web_session_id.Get(dispatcher()),
-                                    exception_code,
-                                    system_code,
+    enter.functions()->SessionError(instance, session_id.Get(dispatcher()),
+                                    exception_code, system_code,
                                     error_description.Get(dispatcher()));
   }
 }
diff --git a/ppapi/proxy/ppb_instance_proxy.h b/ppapi/proxy/ppb_instance_proxy.h
index 6b38116..6cf3d06 100644
--- a/ppapi/proxy/ppb_instance_proxy.h
+++ b/ppapi/proxy/ppb_instance_proxy.h
@@ -124,29 +124,29 @@ class PPB_Instance_Proxy : public InterfaceProxy,
   void PromiseResolved(PP_Instance instance, uint32 promise_id) override;
   void PromiseResolvedWithSession(PP_Instance instance,
                                   uint32 promise_id,
-                                  PP_Var web_session_id_var) override;
+                                  PP_Var session_id_var) override;
   void PromiseRejected(PP_Instance instance,
                        uint32 promise_id,
                        PP_CdmExceptionCode exception_code,
                        uint32 system_code,
                        PP_Var error_description_var) override;
   void SessionMessage(PP_Instance instance,
-                      PP_Var web_session_id_var,
+                      PP_Var session_id_var,
                       PP_CdmMessageType message_type,
                       PP_Var message_var,
                       PP_Var legacy_destination_url_var) override;
   void SessionKeysChange(
       PP_Instance instance,
-      PP_Var web_session_id_var,
+      PP_Var session_id_var,
       PP_Bool has_additional_usable_key,
       uint32_t key_count,
       const struct PP_KeyInformation key_information[]) override;
   void SessionExpirationChange(PP_Instance instance,
-                               PP_Var web_session_id_var,
+                               PP_Var session_id_var,
                                PP_Time new_expiry_time) override;
-  void SessionClosed(PP_Instance instance, PP_Var web_session_id_var) override;
+  void SessionClosed(PP_Instance instance, PP_Var session_id_var) override;
   void SessionError(PP_Instance instance,
-                    PP_Var web_session_id_var,
+                    PP_Var session_id_var,
                     PP_CdmExceptionCode exception_code,
                     uint32 system_code,
                     PP_Var error_description_var) override;
@@ -254,7 +254,7 @@ class PPB_Instance_Proxy : public InterfaceProxy,
   virtual void OnHostMsgPromiseResolvedWithSession(
       PP_Instance instance,
       uint32_t promise_id,
-      SerializedVarReceiveInput web_session_id);
+      SerializedVarReceiveInput session_id);
   virtual void OnHostMsgPromiseRejected(
       PP_Instance instance,
       uint32_t promise_id,
@@ -263,24 +263,24 @@ class PPB_Instance_Proxy : public InterfaceProxy,
       SerializedVarReceiveInput error_description);
   virtual void OnHostMsgSessionMessage(
       PP_Instance instance,
-      SerializedVarReceiveInput web_session_id,
+      SerializedVarReceiveInput session_id,
       PP_CdmMessageType message_type,
       SerializedVarReceiveInput message,
       SerializedVarReceiveInput legacy_destination_url);
   virtual void OnHostMsgSessionKeysChange(
       PP_Instance instance,
-      const std::string& web_session_id,
+      const std::string& session_id,
       PP_Bool has_additional_usable_key,
       const std::vector<PP_KeyInformation>& key_information);
   virtual void OnHostMsgSessionExpirationChange(
       PP_Instance instance,
-      const std::string& web_session_id,
+      const std::string& session_id,
       PP_Time new_expiry_time);
   virtual void OnHostMsgSessionClosed(PP_Instance instance,
-                                      SerializedVarReceiveInput web_session_id);
+                                      SerializedVarReceiveInput session_id);
   virtual void OnHostMsgSessionError(
       PP_Instance instance,
-      SerializedVarReceiveInput web_session_id,
+      SerializedVarReceiveInput session_id,
       PP_CdmExceptionCode exception_code,
       uint32_t system_code,
       SerializedVarReceiveInput error_description);
diff --git a/ppapi/proxy/ppp_content_decryptor_private_proxy.cc b/ppapi/proxy/ppp_content_decryptor_private_proxy.cc
index 0ec1d10..91ea370 100644
--- a/ppapi/proxy/ppp_content_decryptor_private_proxy.cc
+++ b/ppapi/proxy/ppp_content_decryptor_private_proxy.cc
@@ -181,7 +181,7 @@ void CreateSessionAndGenerateRequest(PP_Instance instance,
 void LoadSession(PP_Instance instance,
                  uint32_t promise_id,
                  PP_SessionType session_type,
-                 PP_Var web_session_id) {
+                 PP_Var session_id) {
   HostDispatcher* dispatcher = HostDispatcher::GetForInstance(instance);
   if (!dispatcher) {
     NOTREACHED();
@@ -190,12 +190,12 @@ void LoadSession(PP_Instance instance,
 
   dispatcher->Send(new PpapiMsg_PPPContentDecryptor_LoadSession(
       API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE, instance, promise_id, session_type,
-      SerializedVarSendInput(dispatcher, web_session_id)));
+      SerializedVarSendInput(dispatcher, session_id)));
 }
 
 void UpdateSession(PP_Instance instance,
                    uint32_t promise_id,
-                   PP_Var web_session_id,
+                   PP_Var session_id,
                    PP_Var response) {
   HostDispatcher* dispatcher = HostDispatcher::GetForInstance(instance);
   if (!dispatcher) {
@@ -204,57 +204,53 @@ void UpdateSession(PP_Instance instance,
   }
 
   dispatcher->Send(new PpapiMsg_PPPContentDecryptor_UpdateSession(
-      API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE,
-      instance,
-      promise_id,
-      SerializedVarSendInput(dispatcher, web_session_id),
+      API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE, instance, promise_id,
+      SerializedVarSendInput(dispatcher, session_id),
       SerializedVarSendInput(dispatcher, response)));
 }
 
 void CloseSession(PP_Instance instance,
                   uint32_t promise_id,
-                  PP_Var web_session_id) {
+                  PP_Var session_id) {
   HostDispatcher* dispatcher = HostDispatcher::GetForInstance(instance);
   if (!dispatcher) {
     NOTREACHED();
     return;
   }
 
-  StringVar* session_id = StringVar::FromPPVar(web_session_id);
-  if (!session_id ||
-      session_id->value().length() > media::limits::kMaxWebSessionIdLength) {
+  StringVar* session_id_string = StringVar::FromPPVar(session_id);
+  if (!session_id_string ||
+      session_id_string->value().length() >
+          media::limits::kMaxSessionIdLength) {
     NOTREACHED();
     return;
   }
 
   dispatcher->Send(new PpapiMsg_PPPContentDecryptor_CloseSession(
-      API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE,
-      instance,
-      promise_id,
-      session_id->value()));
+      API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE, instance, promise_id,
+      session_id_string->value()));
 }
 
 void RemoveSession(PP_Instance instance,
                    uint32_t promise_id,
-                   PP_Var web_session_id) {
+                   PP_Var session_id) {
   HostDispatcher* dispatcher = HostDispatcher::GetForInstance(instance);
   if (!dispatcher) {
     NOTREACHED();
     return;
   }
 
-  StringVar* session_id = StringVar::FromPPVar(web_session_id);
-  if (!session_id ||
-      session_id->value().length() > media::limits::kMaxWebSessionIdLength) {
+  StringVar* session_id_string = StringVar::FromPPVar(session_id);
+  if (!session_id_string ||
+      session_id_string->value().length() >
+          media::limits::kMaxSessionIdLength) {
     NOTREACHED();
     return;
   }
 
   dispatcher->Send(new PpapiMsg_PPPContentDecryptor_RemoveSession(
-      API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE,
-      instance,
-      promise_id,
-      session_id->value()));
+      API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE, instance, promise_id,
+      session_id_string->value()));
 }
 
 void Decrypt(PP_Instance instance,
@@ -576,54 +572,47 @@ void PPP_ContentDecryptor_Private_Proxy::OnMsgLoadSession(
     PP_Instance instance,
     uint32_t promise_id,
     PP_SessionType session_type,
-    SerializedVarReceiveInput web_session_id) {
+    SerializedVarReceiveInput session_id) {
   if (ppp_decryptor_impl_) {
-    CallWhileUnlocked(
-        ppp_decryptor_impl_->LoadSession, instance, promise_id, session_type,
-        ExtractReceivedVarAndAddRef(dispatcher(), &web_session_id));
+    CallWhileUnlocked(ppp_decryptor_impl_->LoadSession, instance, promise_id,
+                      session_type,
+                      ExtractReceivedVarAndAddRef(dispatcher(), &session_id));
   }
 }
 
 void PPP_ContentDecryptor_Private_Proxy::OnMsgUpdateSession(
     PP_Instance instance,
     uint32_t promise_id,
-    SerializedVarReceiveInput web_session_id,
+    SerializedVarReceiveInput session_id,
     SerializedVarReceiveInput response) {
   if (ppp_decryptor_impl_) {
-    CallWhileUnlocked(
-        ppp_decryptor_impl_->UpdateSession,
-        instance,
-        promise_id,
-        ExtractReceivedVarAndAddRef(dispatcher(), &web_session_id),
-        ExtractReceivedVarAndAddRef(dispatcher(), &response));
+    CallWhileUnlocked(ppp_decryptor_impl_->UpdateSession, instance, promise_id,
+                      ExtractReceivedVarAndAddRef(dispatcher(), &session_id),
+                      ExtractReceivedVarAndAddRef(dispatcher(), &response));
   }
 }
 
 void PPP_ContentDecryptor_Private_Proxy::OnMsgCloseSession(
     PP_Instance instance,
     uint32_t promise_id,
-    const std::string& web_session_id) {
+    const std::string& session_id) {
   if (ppp_decryptor_impl_) {
-    ScopedPPVar web_session_id_var(ScopedPPVar::PassRef(),
-                                   StringVar::StringToPPVar(web_session_id));
-    CallWhileUnlocked(ppp_decryptor_impl_->CloseSession,
-                      instance,
-                      promise_id,
-                      web_session_id_var.get());
+    ScopedPPVar session_id_var(ScopedPPVar::PassRef(),
+                               StringVar::StringToPPVar(session_id));
+    CallWhileUnlocked(ppp_decryptor_impl_->CloseSession, instance, promise_id,
+                      session_id_var.get());
   }
 }
 
 void PPP_ContentDecryptor_Private_Proxy::OnMsgRemoveSession(
     PP_Instance instance,
     uint32_t promise_id,
-    const std::string& web_session_id) {
+    const std::string& session_id) {
   if (ppp_decryptor_impl_) {
-    ScopedPPVar web_session_id_var(ScopedPPVar::PassRef(),
-                                   StringVar::StringToPPVar(web_session_id));
-    CallWhileUnlocked(ppp_decryptor_impl_->RemoveSession,
-                      instance,
-                      promise_id,
-                      web_session_id_var.get());
+    ScopedPPVar session_id_var(ScopedPPVar::PassRef(),
+                               StringVar::StringToPPVar(session_id));
+    CallWhileUnlocked(ppp_decryptor_impl_->RemoveSession, instance, promise_id,
+                      session_id_var.get());
   }
 }
 
diff --git a/ppapi/proxy/ppp_content_decryptor_private_proxy.h b/ppapi/proxy/ppp_content_decryptor_private_proxy.h
index 398be63..cc67f94 100644
--- a/ppapi/proxy/ppp_content_decryptor_private_proxy.h
+++ b/ppapi/proxy/ppp_content_decryptor_private_proxy.h
@@ -45,17 +45,17 @@ class PPP_ContentDecryptor_Private_Proxy : public InterfaceProxy {
   void OnMsgLoadSession(PP_Instance instance,
                         uint32_t promise_id,
                         PP_SessionType session_type,
-                        SerializedVarReceiveInput web_session_id);
+                        SerializedVarReceiveInput session_id);
   void OnMsgUpdateSession(PP_Instance instance,
                           uint32_t promise_id,
-                          SerializedVarReceiveInput web_session_id,
+                          SerializedVarReceiveInput session_id,
                           SerializedVarReceiveInput response);
   void OnMsgCloseSession(PP_Instance instance,
                          uint32_t promise_id,
-                         const std::string& web_session_id);
+                         const std::string& session_id);
   void OnMsgRemoveSession(PP_Instance instance,
                           uint32_t promise_id,
-                          const std::string& web_session_id);
+                          const std::string& session_id);
   void OnMsgDecrypt(PP_Instance instance,
                     const PPPDecryptor_Buffer& encrypted_buffer,
                     const std::string& serialized_encrypted_block_info);