Allows support for persistent session types in BrowserCdm.

content/renderer/media/crypto/renderer_cdm_manager.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/crypto/renderer_cdm_manager.h"
 
 #include "base/stl_util.h"
 #include "content/common/media/cdm_messages.h"
 #include "content/renderer/media/crypto/proxy_media_keys.h"
 #include "media/base/cdm_context.h"
@@ skipping 56 matching lines @@
     uint32_t promise_id,
     const std::vector<uint8_t>& certificate) {
   DCHECK(GetMediaKeys(cdm_id)) << "|cdm_id| not registered.";
   Send(new CdmHostMsg_SetServerCertificate(routing_id(), cdm_id, promise_id,
                                            certificate));
 }
 
 void RendererCdmManager::CreateSessionAndGenerateRequest(
     int cdm_id,
     uint32_t promise_id,
+    media::MediaKeys::SessionType session_type,
     CdmHostMsg_CreateSession_InitDataType init_data_type,
     const std::vector<uint8_t>& init_data) {
   DCHECK(GetMediaKeys(cdm_id)) << "|cdm_id| not registered.";
-  Send(new CdmHostMsg_CreateSessionAndGenerateRequest(
-      routing_id(), cdm_id, promise_id, init_data_type, init_data));
+  CdmHostMsg_CreateSessionAndGenerateRequest_Params params;
+  params.render_frame_id = routing_id();
+  params.cdm_id = cdm_id;
+  params.promise_id = promise_id;
+  params.session_type = session_type;
+  params.init_data_type = init_data_type;
+  params.init_data = init_data;
+  Send(new CdmHostMsg_CreateSessionAndGenerateRequest(params));
+}
+
+void RendererCdmManager::LoadSession(
+    int cdm_id,
+    uint32_t promise_id,
+    media::MediaKeys::SessionType session_type,
+    const std::string& session_id) {
+  DCHECK(GetMediaKeys(cdm_id)) << "|cdm_id| not registered.";
+  Send(new CdmHostMsg_LoadSession(routing_id(), cdm_id, promise_id,
+                                  session_type, session_id));
 }
 
 void RendererCdmManager::UpdateSession(int cdm_id,
                                        uint32_t promise_id,
                                        const std::string& session_id,
                                        const std::vector<uint8_t>& response) {
   DCHECK(GetMediaKeys(cdm_id)) << "|cdm_id| not registered.";
   Send(new CdmHostMsg_UpdateSession(routing_id(), cdm_id, promise_id,
                                     session_id, response));
 }
 
 void RendererCdmManager::CloseSession(int cdm_id,
                                       uint32_t promise_id,
                                       const std::string& session_id) {
   DCHECK(GetMediaKeys(cdm_id)) << "|cdm_id| not registered.";
   Send(new CdmHostMsg_CloseSession(routing_id(), cdm_id, promise_id,
                                    session_id));
 }
 
+void RendererCdmManager::RemoveSession(int cdm_id,
+                                      uint32_t promise_id,
+                                      const std::string& session_id) {
+  DCHECK(GetMediaKeys(cdm_id)) << "|cdm_id| not registered.";
+  Send(new CdmHostMsg_RemoveSession(routing_id(), cdm_id, promise_id,
+                                    session_id));
+}
+
 void RendererCdmManager::DestroyCdm(int cdm_id) {
   DCHECK(GetMediaKeys(cdm_id)) << "|cdm_id| not registered.";
   Send(new CdmHostMsg_DestroyCdm(routing_id(), cdm_id));
 }
 
 void RendererCdmManager::OnSessionMessage(
     int cdm_id,
     const std::string& session_id,
     media::MediaKeys::MessageType message_type,
     const std::vector<uint8>& message,
@@ skipping 102 matching lines @@
   proxy_media_keys_map_.erase(cdm_id);
 }
 
 ProxyMediaKeys* RendererCdmManager::GetMediaKeys(int cdm_id) {
   std::map<int, ProxyMediaKeys*>::iterator iter =
       proxy_media_keys_map_.find(cdm_id);
   return (iter != proxy_media_keys_map_.end()) ? iter->second : NULL;
 }
 
 }  // namespace content