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 =

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

is_load_session

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

Done.

       HasHeader(init_data, init_data_length, kPrefixedApiLoadSessionHeader);
   bool persistent = HasHeader(

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

is_

is_create_persistent?

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

Done.

       init_data, init_data_length, kPrefixedApiPersistentSessionHeader);
 
   scoped_ptr<media::NewSessionCdmPromise> promise(
       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.
 
   if (loadSession) {
     media_keys_->LoadSession(
         std::string(reinterpret_cast<const char*>(
                         init_data + strlen(kPrefixedApiLoadSessionHeader)),
                     init_data_length - strlen(kPrefixedApiLoadSessionHeader)),
         promise.Pass());
@@ skipping 155 matching lines @@
     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,
+                                  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