Add Promises for EME (Chromium side)

media/base/android/media_source_player.h

 // Copyright (c) 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 MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_
 #define MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_
 
 #include <jni.h>
 #include <map>
 #include <string>
@@ skipping 43 matching lines @@
   virtual void SetVolume(double volume) OVERRIDE;
   virtual int GetVideoWidth() OVERRIDE;
   virtual int GetVideoHeight() OVERRIDE;
   virtual base::TimeDelta GetCurrentTime() OVERRIDE;
   virtual base::TimeDelta GetDuration() OVERRIDE;
   virtual bool IsPlaying() OVERRIDE;
   virtual bool CanPause() OVERRIDE;
   virtual bool CanSeekForward() OVERRIDE;
   virtual bool CanSeekBackward() OVERRIDE;
   virtual bool IsPlayerReady() OVERRIDE;
-  virtual void SetCdm(MediaKeys* cdm) OVERRIDE;
+  virtual void SetCdm(MediaDrmBridge* cdm) OVERRIDE;
   virtual void OnKeyAdded() OVERRIDE;
   virtual bool IsSurfaceInUse() const OVERRIDE;
 
   // DemuxerAndroidClient implementation.
   virtual void OnDemuxerConfigsAvailable(const DemuxerConfigs& params) OVERRIDE;
   virtual void OnDemuxerDataAvailable(const DemuxerData& params) OVERRIDE;
   virtual void OnDemuxerSeekDone(
       base::TimeDelta actual_browser_seek_time) OVERRIDE;
   virtual void OnDemuxerDurationChanged(base::TimeDelta duration) OVERRIDE;
 
@@ skipping 217 matching lines @@
   // Weak pointer passed to media decoder jobs for callbacks.
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<MediaSourcePlayer> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_