Update ClearKey to support CDM_6

content/renderer/media/crypto/proxy_decryptor.cc

Index: content/renderer/media/crypto/proxy_decryptor.cc
diff --git a/content/renderer/media/crypto/proxy_decryptor.cc b/content/renderer/media/crypto/proxy_decryptor.cc
index 28cd421e85ff099858007c541c025fd594b92bc0..4ad60d680fc7f3eff850430d7a8a67351ec21917 100644
--- a/content/renderer/media/crypto/proxy_decryptor.cc
+++ b/content/renderer/media/crypto/proxy_decryptor.cc
@@ -111,7 +111,8 @@ bool ProxyDecryptor::GenerateKeyRequest(const std::string& content_type,
       new media::NewSessionCdmPromise(
           base::Bind(&ProxyDecryptor::SetSessionId,
                      weak_ptr_factory_.GetWeakPtr(),
-                     persistent || loadSession),
+                     persistent,
+                     loadSession),
           base::Bind(&ProxyDecryptor::OnSessionError,
                      weak_ptr_factory_.GetWeakPtr(),
                      std::string())));  // No session id until created.
@@ -287,8 +288,14 @@ void ProxyDecryptor::OnSessionError(const std::string& web_session_id,
 }
 
 void ProxyDecryptor::SetSessionId(bool persistent,
+                                  bool load_session,
                                   const std::string& web_session_id) {
-  active_sessions_.insert(std::make_pair(web_session_id, persistent));
+  active_sessions_.insert(
+      std::make_pair(web_session_id, persistent || load_session));

[ddorwin, 2014/08/08 23:36:23]

it might be nice to use a local variable to describe what we're building/passing

[jrummell, 2014/08/11 18:59:03]

Done.

+
+  // For LoadSession(), generate the SessionReady event.
+  if (load_session)
+    OnSessionReady(web_session_id);
 }
 
 }  // namespace content