Update ClearKey to support CDM_6

content/renderer/media/crypto/proxy_decryptor.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 CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_
 #define CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 79 matching lines @@
                         const std::vector<uint8>& message,
                         const GURL& default_url);
   void OnSessionReady(const std::string& web_session_id);
   void OnSessionClosed(const std::string& web_session_id);
   void OnSessionError(const std::string& web_session_id,
                       media::MediaKeys::Exception exception_code,
                       uint32 system_code,
                       const std::string& error_message);
 
   // Called when a session is actually created or loaded.
-  void SetSessionId(bool persistent, const std::string& web_session_id);
+  void SetSessionId(bool persistent,

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

is_new_persistent_session

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

Done.

+                    bool load_session,

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

is_loaded_session

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

Done.

+                    const std::string& web_session_id);
 
 #if defined(ENABLE_PEPPER_CDMS)
   // Callback to create the Pepper plugin.
   CreatePepperCdmCB create_pepper_cdm_cb_;
 #elif defined(ENABLE_BROWSER_CDMS)
   RendererCdmManager* manager_;
   int cdm_id_;
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
   // The real MediaKeys that manages key operations for the ProxyDecryptor.
@@ skipping 11 matching lines @@
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<ProxyDecryptor> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyDecryptor);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_