Support LoadSession() in MediaKeys and PPP_ContentDecryptor_Private interface.

media/base/media_keys.h

Index: media/base/media_keys.h
diff --git a/media/base/media_keys.h b/media/base/media_keys.h
index 0d86948564e32a350ebbed804292cd85f5787c36..84c1401482d92ec68066f6af03059d02148893a2 100644
--- a/media/base/media_keys.h
+++ b/media/base/media_keys.h
@@ -42,16 +42,23 @@ class MEDIA_EXPORT MediaKeys {
   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,