Add Promises for EME (Chromium side)

content/browser/media/android/browser_media_player_manager.h

 // Copyright 2013 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 CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
 #define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/time/time.h"
 #include "content/browser/android/content_video_view.h"
 #include "content/common/content_export.h"
 #include "content/common/media/cdm_messages_enums.h"
 #include "content/common/media/media_player_messages_enums_android.h"
 #include "ipc/ipc_message.h"
 #include "media/base/android/media_player_android.h"
 #include "media/base/android/media_player_manager.h"
+#include "media/base/media_keys.h"
 #include "ui/gfx/rect_f.h"
 #include "url/gurl.h"
 
 namespace media {
 class DemuxerAndroid;
-class MediaKeys;
+class MediaDrmBridge;

[ddorwin, 2014/05/30 18:43:56]

This basically reverts a previous CL. :(
We might need to just wait for https://codereview.chromium.org/308073004/.

[xhwang, 2014/06/02 21:59:21]

Yeah, this will be BrowserCdm, which can be not a subclass of MediaKeys.

 }
 
 namespace content {
 class BrowserDemuxerAndroid;
 class ContentViewCoreImpl;
 class ExternalVideoSurfaceContainer;
 class RenderFrameHost;
 class WebContents;
 
 // This class manages all the MediaPlayerAndroid and CDM objects.
@@ skipping 43 matching lines @@
   virtual void OnBufferingUpdate(int player_id, int percentage) OVERRIDE;
   virtual void OnSeekComplete(
       int player_id,
       const base::TimeDelta& current_time) OVERRIDE;
   virtual void OnError(int player_id, int error) OVERRIDE;
   virtual void OnVideoSizeChanged(
       int player_id, int width, int height) OVERRIDE;
   virtual media::MediaResourceGetter* GetMediaResourceGetter() OVERRIDE;
   virtual media::MediaPlayerAndroid* GetFullscreenPlayer() OVERRIDE;
   virtual media::MediaPlayerAndroid* GetPlayer(int player_id) OVERRIDE;
-  virtual media::MediaKeys* GetCdm(int cdm_id) OVERRIDE;
+  virtual media::MediaDrmBridge* GetCdm(int cdm_id) OVERRIDE;
   virtual void DestroyAllMediaPlayers() OVERRIDE;
   virtual void RequestFullScreen(int player_id) OVERRIDE;
   virtual void OnSessionCreated(int cdm_id,
                                 uint32 session_id,
                                 const std::string& web_session_id) OVERRIDE;
   virtual void OnSessionMessage(int cdm_id,
                                 uint32 session_id,
                                 const std::vector<uint8>& message,
                                 const GURL& destination_url) OVERRIDE;
   virtual void OnSessionReady(int cdm_id, uint32 session_id) OVERRIDE;
@@ skipping 117 matching lines @@
 #if defined(VIDEO_HOLE)
   void OnRequestExternalSurface(int player_id, const gfx::RectF& rect);
 #endif  // defined(VIDEO_HOLE)
 
   RenderFrameHost* const render_frame_host_;
 
   // An array of managed players.
   ScopedVector<media::MediaPlayerAndroid> players_;
 
   // A map from CDM IDs to managed CDMs.
-  typedef std::map<int, media::MediaKeys*> CdmMap;
+  typedef std::map<int, media::MediaDrmBridge*> CdmMap;
   CdmMap cdm_map_;
 
   // Map from CDM ID to MediaPlayerAndroid player ID to indicate that
   // the CDM is set on the MediaPlayerAndroid object.
   // TODO(xhwang): Register a callback in the CDM to resume playback so that we
   // can remove this map. See http://crbug.com/373327
   typedef std::map<int, int> CdmToPlayerMap;
   CdmToPlayerMap cdm_to_player_map_;
 
   // Map from CDM ID to CDM's security origin.
@@ skipping 20 matching lines @@
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<BrowserMediaPlayerManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_