Support LoadSession() in MediaKeys and PPP_ContentDecryptor_Private interface.

content/renderer/pepper/content_decryptor_delegate.cc

 // Copyright (c) 2012 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/pepper/content_decryptor_delegate.h"
 
 #include "base/callback_helpers.h"
 #include "base/debug/trace_event.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/numerics/safe_conversions.h"
@@ skipping 268 matching lines @@
   plugin_decryption_interface_->Initialize(
       pp_instance_, StringVar::StringToPPVar(key_system_));
 }
 
 void ContentDecryptorDelegate::InstanceCrashed() {
   fatal_plugin_error_cb_.Run();
   SatisfyAllPendingCallbacksOnError();
 }
 
 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;
 }
 
+void ContentDecryptorDelegate::LoadSession(uint32 session_id,
+                                           const std::string& web_session_id) {
+  plugin_decryption_interface_->LoadSession(
+      pp_instance_, session_id, StringVar::StringToPPVar(web_session_id));
+}
+
 bool ContentDecryptorDelegate::UpdateSession(uint32 session_id,
                                              const uint8* response,
                                              int response_length) {
   PP_Var response_array =
       PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar(
           response_length, response);
   plugin_decryption_interface_->UpdateSession(
       pp_instance_, session_id, response_array);
   return true;
 }
@@ skipping 735 matching lines @@
     const media::Decryptor::AudioBuffers empty_frames;
     audio_decode_cb_.ResetAndReturn().Run(media::Decryptor::kError,
                                           empty_frames);
   }
 
   if (!video_decode_cb_.is_null())
     video_decode_cb_.ResetAndReturn().Run(media::Decryptor::kError, NULL);
 }
 
 }  // namespace content