Update ClearKey to support CDM_6

media/base/media_keys.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 MEDIA_BASE_MEDIA_KEYS_H_
 #define MEDIA_BASE_MEDIA_KEYS_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/media_export.h"
 #include "url/gurl.h"
 
 namespace media {
 
 class Decryptor;
 
 template <typename T>
 class CdmPromiseTemplate;
 
 typedef CdmPromiseTemplate<std::string> NewSessionCdmPromise;
 typedef CdmPromiseTemplate<void> SimpleCdmPromise;
+typedef std::vector<std::vector<uint8> > KeyIdsVector;
+typedef CdmPromiseTemplate<KeyIdsVector> KeyIdsPromise;
 
 // Performs media key operations.
 //
 // All key operations are called on the renderer thread. Therefore, these calls
 // should be fast and nonblocking; key events should be fired asynchronously.
 class MEDIA_EXPORT MediaKeys {

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

Why isn't GetUsableKeyIds added to this interface?

It seems odd that we're implementing things that are not yet part of the main
interface. Should we implement that (with stubs) first, or as part of this CL
since it probably doesn't add more than a few lines?

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

I didn't do it in this CL since MediaKeys is used in a whole bunch of places
(including Android). It will be part of a future CL.

  public:
   // Reported to UMA, so never reuse a value!
   // Must be kept in sync with blink::WebMediaPlayerClient::MediaKeyErrorCode
   // (enforced in webmediaplayer_impl.cc).
   // TODO(jrummell): Can this be moved to proxy_decryptor as it should only be
   // used by the prefixed EME code?
   enum KeyError {
     kUnknownError = 1,
     kClientError,
     // The commented v0.1b values below have never been used.
@@ skipping 74 matching lines @@
 typedef base::Callback<void(const std::string& web_session_id)> SessionClosedCB;
 
 typedef base::Callback<void(const std::string& web_session_id,
                             MediaKeys::Exception exception_code,
                             uint32 system_code,
                             const std::string& error_message)> SessionErrorCB;
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_MEDIA_KEYS_H_