[Chromecast] Allow CMA backend to notify of key expiry

chromecast/media/cdm/browser_cdm_cast.cc

 // Copyright 2014 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 "chromecast/media/cdm/browser_cdm_cast.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 108 matching lines @@
   session_message_cb_.Run(session_id,
                           message_type,
                           message,
                           destination_url);
 }
 
 void BrowserCdmCast::OnSessionClosed(const std::string& session_id) {
   session_closed_cb_.Run(session_id);
 }
 
-void BrowserCdmCast::OnSessionKeysChange(
-    const std::string& session_id,
-    const ::media::KeyIdAndKeyPairs& keys) {
-  ::media::CdmKeysInfo cdm_keys_info;
+void BrowserCdmCast::OnSessionKeysChange(const std::string& session_id,
+                                         bool newly_usable_keys,
+                                         ::media::CdmKeysInfo keys_info) {
+  session_keys_change_cb_.Run(session_id, newly_usable_keys, keys_info.Pass());
+
+  if (newly_usable_keys)
+    player_tracker_impl_->NotifyNewKey();
+}
+
+void BrowserCdmCast::KeyIdAndKeyPairsToInfo(
+    const ::media::KeyIdAndKeyPairs& keys,
+    ::media::CdmKeysInfo* keys_info) {
+  DCHECK(keys_info);
   for (const std::pair<std::string, std::string>& key : keys) {
-    cdm_keys_info.push_back(new ::media::CdmKeyInformation(
-        key.first, ::media::CdmKeyInformation::USABLE, 0));
+    scoped_ptr<::media::CdmKeyInformation> cdm_key_information(
+        new ::media::CdmKeyInformation(key.first,

[yucliu1, 2015/11/18 19:28:26]

The constructor with arguments isn't available in m47 yet. Consider using the
default one, or making local changes when cherry-pick?

[halliwell, 2015/11/18 19:32:32]

Correct, I have been working with local changes to test in m47.  It's not a big
change.

+                                       ::media::CdmKeyInformation::USABLE, 0));
+    keys_info->push_back(cdm_key_information.release());
   }
-  session_keys_change_cb_.Run(session_id, true, cdm_keys_info.Pass());
-
-  player_tracker_impl_->NotifyNewKey();
 }
 
 // A macro runs current member function on |task_runner_| thread.
 #define FORWARD_ON_CDM_THREAD(param_fn, ...) \
   task_runner_->PostTask(                    \
       FROM_HERE,                             \
       base::Bind(&BrowserCdmCast::param_fn,  \
                  base::Unretained(browser_cdm_cast_.get()), ##__VA_ARGS__))
 
 BrowserCdmCastUi::BrowserCdmCastUi(
@@ skipping 76 matching lines @@
       base::Passed(BindPromiseToCurrentLoop(promise.Pass())));
 }
 
 // A default empty implementation for subclasses that don't need to provide
 // any key system specific initialization.
 void BrowserCdmCast::InitializeInternal() {
 }
 
 }  // namespace media
 }  // namespace chromecast