Pass key_information on SessionKeysChange message

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 base {
 class Time;
 }
 
 namespace media {
 
 class CdmContext;
+class CdmKeyInformation;
 
 template <typename... T>
 class CdmPromiseTemplate;
 
 typedef CdmPromiseTemplate<std::string> NewSessionCdmPromise;
 typedef CdmPromiseTemplate<> SimpleCdmPromise;
+typedef std::vector<CdmKeyInformation> CdmKeyInformationVector;

[xhwang, 2015/01/02 21:55:07]

Throughout this CL, how about
s/CdmKeyInformationVector/CdmKeysInfo/
s/key_information/keys_info
?

KeysInfo is consistent with KeysChange. Also, "keys_info" makes it clear that we
have info for multiple keys.

[xhwang, 2015/01/02 21:55:07]

Is it worth using ScopedVector here? If not, add a comment in CdmKeyInformation
about why we make it copyable. (e.g. it needs to be used in a STL container...)

[jrummell, 2015/01/05 22:17:59]

Done.

[jrummell, 2015/01/05 22:17:59]

Done.

 
 // 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{
  public:
   // Reported to UMA, so never reuse a value!
   // Must be kept in sync with blink::WebMediaPlayerClient::MediaKeyErrorCode
   // (enforced in webmediaplayer_impl.cc).
@@ skipping 89 matching lines @@
                             const GURL& destination_url)> SessionMessageCB;
 
 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;
 
 typedef base::Callback<void(const std::string& web_session_id,
-                            bool has_additional_usable_key)>
+                            bool has_additional_usable_key,
+                            const CdmKeyInformationVector& key_information)>
     SessionKeysChangeCB;
 
 typedef base::Callback<void(const std::string& web_session_id,
                             const base::Time& new_expiry_time)>
     SessionExpirationUpdateCB;
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_MEDIA_KEYS_H_