media: Support unprefixed EME API on Android.

media/base/browser_cdm_factory.cc

Index: media/base/browser_cdm_factory.cc
diff --git a/media/base/browser_cdm_factory.cc b/media/base/browser_cdm_factory.cc
index 5eda1554935a08a1ced660467c94e6bee40994a8..81b6e970bdbcf265be0a9af6702b339e72578da4 100644
--- a/media/base/browser_cdm_factory.cc
+++ b/media/base/browser_cdm_factory.cc
@@ -23,11 +23,11 @@ void SetBrowserCdmFactory(BrowserCdmFactory* factory) {
 
 scoped_ptr<BrowserCdm> CreateBrowserCdm(
     const std::string& key_system,
-    const BrowserCdm::SessionCreatedCB& session_created_cb,
-    const BrowserCdm::SessionMessageCB& session_message_cb,
-    const BrowserCdm::SessionReadyCB& session_ready_cb,
-    const BrowserCdm::SessionClosedCB& session_closed_cb,
-    const BrowserCdm::SessionErrorCB& session_error_cb) {
+    const SessionMessageCB& session_message_cb,
+    const SessionClosedCB& session_closed_cb,
+    const SessionErrorCB& session_error_cb,
+    const SessionKeysChangeCB& session_keys_change_cb,
+    const SessionExpirationUpdateCB& session_expiration_update_cb) {
   if (!g_cdm_factory) {
 #if defined(OS_ANDROID)
     SetBrowserCdmFactory(new BrowserCdmFactoryAndroid);
@@ -37,12 +37,9 @@ scoped_ptr<BrowserCdm> CreateBrowserCdm(
 #endif
   }
 
-  return g_cdm_factory->CreateBrowserCdm(key_system,
-                                         session_created_cb,
-                                         session_message_cb,
-                                         session_ready_cb,
-                                         session_closed_cb,
-                                         session_error_cb);
+  return g_cdm_factory->CreateBrowserCdm(
+      key_system, session_message_cb, session_closed_cb, session_error_cb,
+      session_keys_change_cb, session_expiration_update_cb);
 }
 
 }  // namespace media