Add Promises for EME (Chromium side)

media/base/android/media_player_manager.h

 // Copyright (c) 2012 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_ANDROID_MEDIA_PLAYER_MANAGER_H_
 #define MEDIA_BASE_ANDROID_MEDIA_PLAYER_MANAGER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/time/time.h"
 #include "media/base/android/demuxer_stream_player_params.h"
 #include "media/base/media_export.h"
 #include "media/base/media_keys.h"
 #include "url/gurl.h"
 
 class GURL;
 
 namespace media {
 
-class MediaKeys;
+class MediaDrmBridge;
 class MediaPlayerAndroid;
 class MediaResourceGetter;
 
 // This class is responsible for managing active MediaPlayerAndroid objects.
 class MEDIA_EXPORT MediaPlayerManager {
  public:
   virtual ~MediaPlayerManager() {}
 
   // Return a pointer to the MediaResourceGetter object.
   virtual MediaResourceGetter* GetMediaResourceGetter() = 0;
@@ skipping 35 matching lines @@
   // Returns the player that's in the fullscreen mode currently.
   virtual MediaPlayerAndroid* GetFullscreenPlayer() = 0;
 
   // Returns the player with the specified id.
   virtual MediaPlayerAndroid* GetPlayer(int player_id) = 0;
 
   // Release all the players managed by this object.
   virtual void DestroyAllMediaPlayers() = 0;
 
   // Get the CDM for the given CDM ID.
-  virtual MediaKeys* GetCdm(int cdm_id) = 0;
+  virtual MediaDrmBridge* GetCdm(int cdm_id) = 0;
 
   // Called by the player to get a hardware protected surface.
   virtual void RequestFullScreen(int player_id) = 0;
 
   // The following five methods are related to EME.
   // TODO(xhwang): These methods needs to be decoupled from MediaPlayerManager
   // to support the W3C Working Draft version of the EME spec.
   // http://crbug.com/315312
 
   // Called when CDM creates a session.
@@ skipping 16 matching lines @@
   // Called when CDM wants to send an Error event.
   virtual void OnSessionError(int cdm_id,
                               uint32 session_id,
                               media::MediaKeys::KeyError error_code,
                               uint32 system_code) = 0;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_PLAYER_MANAGER_H_