Update ClearKey to support CDM_6

content/renderer/media/crypto/proxy_decryptor.cc

 // 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.
 
 #include "content/renderer/media/crypto/proxy_decryptor.h"
 
 #include <cstring>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 84 matching lines @@
          std::equal(data, data + header.size(), header.begin());
 }
 
 bool ProxyDecryptor::GenerateKeyRequest(const std::string& content_type,
                                         const uint8* init_data,
                                         int init_data_length) {
   DVLOG(1) << "GenerateKeyRequest()";
   const char kPrefixedApiPersistentSessionHeader[] = "PERSISTENT|";
   const char kPrefixedApiLoadSessionHeader[] = "LOAD_SESSION|";
 
-  bool loadSession =
+  bool is_load_session =
       HasHeader(init_data, init_data_length, kPrefixedApiLoadSessionHeader);
-  bool persistent = HasHeader(
+  bool is_create_persistent = HasHeader(
       init_data, init_data_length, kPrefixedApiPersistentSessionHeader);
 
   scoped_ptr<media::NewSessionCdmPromise> promise(
       new media::NewSessionCdmPromise(
           base::Bind(&ProxyDecryptor::SetSessionId,
                      weak_ptr_factory_.GetWeakPtr(),
-                     persistent || loadSession),
+                     is_create_persistent,
+                     is_load_session),
           base::Bind(&ProxyDecryptor::OnSessionError,
                      weak_ptr_factory_.GetWeakPtr(),
                      std::string())));  // No session id until created.
 
-  if (loadSession) {
+  if (is_load_session) {
     media_keys_->LoadSession(
         std::string(reinterpret_cast<const char*>(
                         init_data + strlen(kPrefixedApiLoadSessionHeader)),
                     init_data_length - strlen(kPrefixedApiLoadSessionHeader)),
         promise.Pass());
     return true;
   }
 
   media::MediaKeys::SessionType session_type =
-      persistent ? media::MediaKeys::PERSISTENT_SESSION
-                 : media::MediaKeys::TEMPORARY_SESSION;
+      is_create_persistent ? media::MediaKeys::PERSISTENT_SESSION
+                           : media::MediaKeys::TEMPORARY_SESSION;
   media_keys_->CreateSession(
       content_type, init_data, init_data_length, session_type, promise.Pass());
   return true;
 }
 
 void ProxyDecryptor::AddKey(const uint8* key,
                             int key_length,
                             const uint8* init_data,
                             int init_data_length,
                             const std::string& web_session_id) {
@@ skipping 138 matching lines @@
       break;
     default:
       // This will include all other CDM4 errors and any error generated
       // by CDM5 or later.
       error_code = media::MediaKeys::kUnknownError;
       break;
   }
   key_error_cb_.Run(web_session_id, error_code, system_code);
 }
 
-void ProxyDecryptor::SetSessionId(bool persistent,
+void ProxyDecryptor::SetSessionId(bool is_new_persistent_session,
+                                  bool is_loaded_session,
                                   const std::string& web_session_id) {
+  // Loaded sessions are considered persistent.
+  bool persistent = is_new_persistent_session || is_loaded_session;

[ddorwin, 2014/08/11 20:34:15]

is_

[jrummell, 2014/08/13 21:18:06]

Done.

   active_sessions_.insert(std::make_pair(web_session_id, persistent));
+
+  // For LoadSession(), generate the SessionReady event.
+  if (is_loaded_session)
+    OnSessionReady(web_session_id);
 }
 
 }  // namespace content