Rename MediaPlayerBridgeManager to MediaPlayerManager

media/base/android/media_player_bridge.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_BRIDGE_H_
 #define MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_
 
 #include <jni.h>
 #include <map>
 #include <string>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "googleurl/src/gurl.h"
 #include "media/base/media_export.h"
 #if defined(GOOGLE_TV)
 #include "media/base/android/demuxer_stream_player_params.h"
 #endif
 #include "media/base/android/media_player_listener.h"
 
 namespace media {
 
-class MediaResourceGetter;
-class MediaPlayerBridgeManager;
+class MediaPlayerManager;
 
 // This class serves as a bridge for native code to call java functions inside
 // android mediaplayer class. For more information on android mediaplayer, check
 // http://developer.android.com/reference/android/media/MediaPlayer.html
 // The actual android mediaplayer instance is created lazily when Start(),
 // Pause(), SeekTo() gets called. As a result, media information may not
 // be available until one of those operations is performed. After that, we
 // will cache those information in case the mediaplayer gets released.
 class MEDIA_EXPORT MediaPlayerBridge {
  public:
@@ skipping 38 matching lines @@
       ReadFromDemuxerCB;
 #endif
 
   static bool RegisterMediaPlayerBridge(JNIEnv* env);
 
   static MediaPlayerBridge* Create(
       int player_id,
       const GURL& url,
       bool is_media_source,
       const GURL& first_party_for_cookies,
-      MediaResourceGetter* resource_getter,
       bool hide_url_log,
-      MediaPlayerBridgeManager* manager,
+      MediaPlayerManager* manager,
 #if defined(GOOGLE_TV)
       const ReadFromDemuxerCB read_from_demuxer_cb,
 #endif
       const MediaErrorCB& media_error_cb,
       const VideoSizeChangedCB& video_size_changed_cb,
       const BufferingUpdateCB& buffering_update_cb,
       const MediaMetadataChangedCB& media_prepared_cb,
       const PlaybackCompleteCB& playback_complete_cb,
       const SeekCompleteCB& seek_complete_cb,
       const TimeUpdateCB& time_update_cb,
       const MediaInterruptedCB& media_interrupted_cb);
 
   // Construct a MediaPlayerBridge object with all the needed media player
   // callbacks. This object needs to call |manager|'s RequestMediaResources()
   // before decoding the media stream. This allows |manager| to track
   // unused resources and free them when needed. On the other hand, it needs
   // to call ReleaseMediaResources() when it is done with decoding.
   MediaPlayerBridge(int player_id,
                     const GURL& url,
                     const GURL& first_party_for_cookies,
-                    MediaResourceGetter* resource_getter,
                     bool hide_url_log,
-                    MediaPlayerBridgeManager* manager,
+                    MediaPlayerManager* manager,
                     const MediaErrorCB& media_error_cb,
                     const VideoSizeChangedCB& video_size_changed_cb,
                     const BufferingUpdateCB& buffering_update_cb,
                     const MediaMetadataChangedCB& media_prepared_cb,
                     const PlaybackCompleteCB& playback_complete_cb,
                     const SeekCompleteCB& seek_complete_cb,
                     const TimeUpdateCB& time_update_cb,
                     const MediaInterruptedCB& media_interrupted_cb);
   virtual ~MediaPlayerBridge();
 
@@ skipping 134 matching lines @@
 
   // Meta data about actions can be taken.
   bool can_pause_;
   bool can_seek_forward_;
   bool can_seek_backward_;
 
   // Cookies for |url_|.
   std::string cookies_;
 
   // Resource manager for all the media players.
-  MediaPlayerBridgeManager* manager_;
-
-  // Object for retrieving resources for this media player.
-  scoped_ptr<MediaResourceGetter> resource_getter_;
+  MediaPlayerManager* manager_;
 
   // Java MediaPlayer instance.
   base::android::ScopedJavaGlobalRef<jobject> j_media_player_;
 
   base::RepeatingTimer<MediaPlayerBridge> time_update_timer_;
 
   // Weak pointer passed to |listener_| for callbacks.
   base::WeakPtrFactory<MediaPlayerBridge> weak_this_;
 
   // Listener object that listens to all the media player events.
   MediaPlayerListener listener_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaPlayerBridge);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_