commit e16def6f1ddbc9872eeb6321d8c7e7d33e79288c
author gunsch <gunsch@chromium.org> Wed Jan 21 20:45:56 2015
committer Commit bot <commit-bot@chromium.org> Wed Jan 21 20:48:09 2015
tree c6bd21d3a23d70a8aca778d847df160b95c2d2b8
parent e587c6d4dd88d9105c4da5130258f7b9fb09960d

Chromecast buildfix: updates BrowserCdmFactory for new API.

See: https://codereview.chromium.org/850183002/

R=lcwu@chromium.org,xhwang@chromium.org
BUG=None

Review URL: https://codereview.chromium.org/861153004

Cr-Commit-Position: refs/heads/master@{#312444}

chromecast/browser/media/cast_browser_cdm_factory.cc

diff --git a/chromecast/browser/media/cast_browser_cdm_factory.cc b/chromecast/browser/media/cast_browser_cdm_factory.cc
index 0021c0d0..6b6dfff 100644
--- a/chromecast/browser/media/cast_browser_cdm_factory.cc
+++ b/chromecast/browser/media/cast_browser_cdm_factory.cc
@@ -9,22 +9,22 @@
 
 scoped_ptr< ::media::BrowserCdm> CastBrowserCdmFactory::CreateBrowserCdm(
     const std::string& key_system_name,
-    const ::media::BrowserCdm::SessionCreatedCB& session_created_cb,
-    const ::media::BrowserCdm::SessionMessageCB& session_message_cb,
-    const ::media::BrowserCdm::SessionReadyCB& session_ready_cb,
-    const ::media::BrowserCdm::SessionClosedCB& session_closed_cb,
-    const ::media::BrowserCdm::SessionErrorCB& session_error_cb) {
+    const ::media::SessionMessageCB& session_message_cb,
+    const ::media::SessionClosedCB& session_closed_cb,
+    const ::media::SessionErrorCB& session_error_cb,
+    const ::media::SessionKeysChangeCB& session_keys_change_cb,
+    const ::media::SessionExpirationUpdateCB& session_expiration_update_cb) {
   CastKeySystem key_system(GetKeySystemByName(key_system_name));
 
   // TODO(gunsch): handle ClearKey decryption. See crbug.com/441957
 
   scoped_ptr< ::media::BrowserCdm> platform_cdm(
       CreatePlatformBrowserCdm(key_system,
-                               session_created_cb,
                                session_message_cb,
-                               session_ready_cb,
                                session_closed_cb,
-                               session_error_cb));
+                               session_error_cb,
+                               session_keys_change_cb,
+                               session_expiration_update_cb));
   if (platform_cdm) {
     return platform_cdm.Pass();
   }

chromecast/browser/media/cast_browser_cdm_factory.h

diff --git a/chromecast/browser/media/cast_browser_cdm_factory.h b/chromecast/browser/media/cast_browser_cdm_factory.h
index a33f9b8..245e5797 100644
--- a/chromecast/browser/media/cast_browser_cdm_factory.h
+++ b/chromecast/browser/media/cast_browser_cdm_factory.h
@@ -20,11 +20,12 @@
   // ::media::BrowserCdmFactory implementation:
   scoped_ptr< ::media::BrowserCdm> CreateBrowserCdm(
       const std::string& key_system,
-      const ::media::BrowserCdm::SessionCreatedCB& session_created_cb,
-      const ::media::BrowserCdm::SessionMessageCB& session_message_cb,
-      const ::media::BrowserCdm::SessionReadyCB& session_ready_cb,
-      const ::media::BrowserCdm::SessionClosedCB& session_closed_cb,
-      const ::media::BrowserCdm::SessionErrorCB& session_error_cb) override;
+      const ::media::SessionMessageCB& session_message_cb,
+      const ::media::SessionClosedCB& session_closed_cb,
+      const ::media::SessionErrorCB& session_error_cb,
+      const ::media::SessionKeysChangeCB& session_keys_change_cb,
+      const ::media::SessionExpirationUpdateCB&
+          session_expiration_update_cb) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CastBrowserCdmFactory);
@@ -33,11 +34,11 @@
 // Allow platform-specific CDMs to be provided.
 scoped_ptr< ::media::BrowserCdm> CreatePlatformBrowserCdm(
     const CastKeySystem& key_system,
-    const ::media::BrowserCdm::SessionCreatedCB& session_created_cb,
-    const ::media::BrowserCdm::SessionMessageCB& session_message_cb,
-    const ::media::BrowserCdm::SessionReadyCB& session_ready_cb,
-    const ::media::BrowserCdm::SessionClosedCB& session_closed_cb,
-    const ::media::BrowserCdm::SessionErrorCB& session_error_cb);
+    const ::media::SessionMessageCB& session_message_cb,
+    const ::media::SessionClosedCB& session_closed_cb,
+    const ::media::SessionErrorCB& session_error_cb,
+    const ::media::SessionKeysChangeCB& session_keys_change_cb,
+    const ::media::SessionExpirationUpdateCB& session_expiration_update_cb);
 
 }  // namespace media
 }  // namespace chromecast

chromecast/browser/media/cast_browser_cdm_factory_simple.cc

diff --git a/chromecast/browser/media/cast_browser_cdm_factory_simple.cc b/chromecast/browser/media/cast_browser_cdm_factory_simple.cc
index 9b7d361..1ccec51 100644
--- a/chromecast/browser/media/cast_browser_cdm_factory_simple.cc
+++ b/chromecast/browser/media/cast_browser_cdm_factory_simple.cc
@@ -9,11 +9,11 @@
 
 scoped_ptr< ::media::BrowserCdm> CreatePlatformBrowserCdm(
     const CastKeySystem& key_system,
-    const ::media::BrowserCdm::SessionCreatedCB& session_created_cb,
-    const ::media::BrowserCdm::SessionMessageCB& session_message_cb,
-    const ::media::BrowserCdm::SessionReadyCB& session_ready_cb,
-    const ::media::BrowserCdm::SessionClosedCB& session_closed_cb,
-    const ::media::BrowserCdm::SessionErrorCB& session_error_cb) {
+    const ::media::SessionMessageCB& session_message_cb,
+    const ::media::SessionClosedCB& session_closed_cb,
+    const ::media::SessionErrorCB& session_error_cb,
+    const ::media::SessionKeysChangeCB& session_keys_change_cb,
+    const ::media::SessionExpirationUpdateCB& session_expiration_update_cb) {
   return scoped_ptr< ::media::BrowserCdm>();
 }