Support LoadSession() in MediaKeys and PPP_ContentDecryptor_Private interface.

media/base/media_keys.h

 // Copyright 2013 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.
 
 #ifndef MEDIA_BASE_MEDIA_KEYS_H_
 #define MEDIA_BASE_MEDIA_KEYS_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 24 matching lines @@
     // kHardwareChangeError,
     // kDomainError,
     kMaxKeyError  // Must be last and greater than any legit value.
   };
 
   const static uint32 kInvalidSessionId = 0;
 
   MediaKeys();
   virtual ~MediaKeys();
 
-  // Generates a key request with the |type| and |init_data| provided.
-  // Returns true if generating key request succeeded, false otherwise.
+  // Creates a session with the |content_type| and |init_data| provided.
+  // Returns true if a session is successfully created, false otherwise.
   // Note: UpdateSession() and ReleaseSession() should only be called after
-  // CreateSession() returns true.
+  // SessionCreatedCB is fired.
   // TODO(jrummell): Remove return value when prefixed API is removed.
+  // See http://crbug.com/342510
   virtual bool CreateSession(uint32 session_id,
-                             const std::string& type,
+                             const std::string& content_type,
                              const uint8* init_data,
                              int init_data_length) = 0;
 
+  // Loads a session with the |web_session_id| provided.
+  // Note: UpdateSession() and ReleaseSession() should only be called after
+  // SessionCreatedCB is fired.
+  virtual void LoadSession(uint32 session_id,
+                           const std::string& web_session_id) = 0;
+
   // Updates a session specified by |session_id| with |response|.
   virtual void UpdateSession(uint32 session_id,
                              const uint8* response,
                              int response_length) = 0;
 
   // Releases the session specified by |session_id|.
   virtual void ReleaseSession(uint32 session_id) = 0;
 
   // Gets the Decryptor object associated with the MediaKeys. Returns NULL if
   // no Decryptor object is associated. The returned object is only guaranteed
@@ skipping 19 matching lines @@
 
 typedef base::Callback<void(uint32 session_id)> SessionClosedCB;
 
 typedef base::Callback<void(uint32 session_id,
                             media::MediaKeys::KeyError error_code,
                             int system_code)> SessionErrorCB;
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_MEDIA_KEYS_H_