Add PlayerTracker and BrowserCdm interfaces.

media/base/android/media_player_android.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_PLAYER_ANDROID_H_
 #define MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_
 
 #include <jni.h>
 #include <string>
 
 #include "base/callback.h"
 #include "base/time/time.h"
 #include "media/base/media_export.h"
 #include "ui/gl/android/scoped_java_surface.h"
 #include "url/gurl.h"
 
 namespace media {
 
-class MediaKeys;
+class BrowserCdm;
 class MediaPlayerManager;
 
 // This class serves as the base class for different media player
 // implementations on Android. Subclasses need to provide their own
 // MediaPlayerAndroid::Create() implementation.
 class MEDIA_EXPORT MediaPlayerAndroid {
  public:
   virtual ~MediaPlayerAndroid();
 
   // Error types for MediaErrorCB.
@@ skipping 37 matching lines @@
   virtual base::TimeDelta GetCurrentTime() = 0;
   virtual bool IsPlaying() = 0;
   virtual bool IsPlayerReady() = 0;
   virtual bool CanPause() = 0;
   virtual bool CanSeekForward() = 0;
   virtual bool CanSeekBackward() = 0;
   virtual GURL GetUrl();
   virtual GURL GetFirstPartyForCookies();
 
   // Associates the |cdm| with this player.
-  virtual void SetCdm(MediaKeys* cdm);
-
-  // Notifies the player that a decryption key has been added. The player
-  // may want to start/resume playback if it is waiting for a key.
-  virtual void OnKeyAdded();
+  virtual void SetCdm(BrowserCdm* cdm);
 
   // Check whether the player still uses the current surface.
   virtual bool IsSurfaceInUse() const = 0;
 
   int player_id() { return player_id_; }
 
  protected:
   MediaPlayerAndroid(int player_id,
                      MediaPlayerManager* manager,
                      const RequestMediaResourcesCB& request_media_resources_cb,
@@ skipping 11 matching lines @@
 
   // Resource manager for all the media players.
   MediaPlayerManager* manager_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaPlayerAndroid);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_