media: Support unprefixed EME API on Android.

media/base/browser_cdm_factory.h

Index: media/base/browser_cdm_factory.h
diff --git a/media/base/browser_cdm_factory.h b/media/base/browser_cdm_factory.h
index f73ca5d0802849625f19f2538efc424f03c8c838..f2bd29c32a4dfde18bb43db0edbf8962a70925d2 100644
--- a/media/base/browser_cdm_factory.h
+++ b/media/base/browser_cdm_factory.h
@@ -21,11 +21,11 @@ class MEDIA_EXPORT BrowserCdmFactory {
 
   virtual 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) = 0;
+      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) = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserCdmFactory);
@@ -39,12 +39,12 @@ void SetBrowserCdmFactory(BrowserCdmFactory* factory);
 // created.
 // TODO(xhwang): Add ifdef for IPC based CDM.
 scoped_ptr<BrowserCdm> MEDIA_EXPORT
-    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);
+CreateBrowserCdm(const std::string& key_system,
+                 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);
 
 }  // namespace media