Rename media player managers.

MediaPlayerManagerImpl -> BrowserMediaPlayerManager
WebMediaPlayerManagerAndroid -> RendererMediaPlayerManager

TBR=jochen@chromium.org
BUG=none

Review URL: https://chromiumcodereview.appspot.com/18704007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211512 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 36 insertions, 36 deletions

diff --git a/content/renderer/media/android/webmediaplayer_manager_android.cc b/content/renderer/media/android/renderer_media_player_manager.cc
index da25fc6..47f140f 100644
--- a/content/renderer/media/android/webmediaplayer_manager_android.cc
+++ b/content/renderer/media/android/renderer_media_player_manager.cc
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/renderer/media/android/webmediaplayer_manager_android.h"
+#include "content/renderer/media/android/renderer_media_player_manager.h"
 
 #include "content/renderer/media/android/webmediaplayer_android.h"
 #include "ui/gfx/rect_f.h"
 
 namespace content {
 
-WebMediaPlayerManagerAndroid::WebMediaPlayerManagerAndroid()
+RendererMediaPlayerManager::RendererMediaPlayerManager()
     : next_media_player_id_(0),
       fullscreen_frame_(NULL) {
 }
 
-WebMediaPlayerManagerAndroid::~WebMediaPlayerManagerAndroid() {
+RendererMediaPlayerManager::~RendererMediaPlayerManager() {
   std::map<int, WebMediaPlayerAndroid*>::iterator player_it;
   for (player_it = media_players_.begin();
       player_it != media_players_.end(); ++player_it) {
@@ -23,17 +23,17 @@ WebMediaPlayerManagerAndroid::~WebMediaPlayerManagerAndroid() {
   }
 }
 
-int WebMediaPlayerManagerAndroid::RegisterMediaPlayer(
+int RendererMediaPlayerManager::RegisterMediaPlayer(
     WebMediaPlayerAndroid* player) {
   media_players_[next_media_player_id_] = player;
   return next_media_player_id_++;
 }
 
-void WebMediaPlayerManagerAndroid::UnregisterMediaPlayer(int player_id) {
+void RendererMediaPlayerManager::UnregisterMediaPlayer(int player_id) {
   media_players_.erase(player_id);
 }
 
-void WebMediaPlayerManagerAndroid::ReleaseMediaResources() {
+void RendererMediaPlayerManager::ReleaseMediaResources() {
   std::map<int, WebMediaPlayerAndroid*>::iterator player_it;
   for (player_it = media_players_.begin();
       player_it != media_players_.end(); ++player_it) {
@@ -45,7 +45,7 @@ void WebMediaPlayerManagerAndroid::ReleaseMediaResources() {
   }
 }
 
-WebMediaPlayerAndroid* WebMediaPlayerManagerAndroid::GetMediaPlayer(
+WebMediaPlayerAndroid* RendererMediaPlayerManager::GetMediaPlayer(
     int player_id) {
   std::map<int, WebMediaPlayerAndroid*>::iterator iter =
       media_players_.find(player_id);
@@ -54,24 +54,24 @@ WebMediaPlayerAndroid* WebMediaPlayerManagerAndroid::GetMediaPlayer(
   return NULL;
 }
 
-bool WebMediaPlayerManagerAndroid::CanEnterFullscreen(WebKit::WebFrame* frame) {
+bool RendererMediaPlayerManager::CanEnterFullscreen(WebKit::WebFrame* frame) {
   return !fullscreen_frame_ || IsInFullscreen(frame);
 }
 
-void WebMediaPlayerManagerAndroid::DidEnterFullscreen(WebKit::WebFrame* frame) {
+void RendererMediaPlayerManager::DidEnterFullscreen(WebKit::WebFrame* frame) {
   fullscreen_frame_ = frame;
 }
 
-void WebMediaPlayerManagerAndroid::DidExitFullscreen() {
+void RendererMediaPlayerManager::DidExitFullscreen() {
   fullscreen_frame_ = NULL;
 }
 
-bool WebMediaPlayerManagerAndroid::IsInFullscreen(WebKit::WebFrame* frame) {
+bool RendererMediaPlayerManager::IsInFullscreen(WebKit::WebFrame* frame) {
   return fullscreen_frame_ == frame;
 }
 
 #if defined(GOOGLE_TV)
-void WebMediaPlayerManagerAndroid::RetrieveGeometryChanges(
+void RendererMediaPlayerManager::RetrieveGeometryChanges(
     std::map<int, gfx::RectF>* changes) {
   DCHECK(changes->empty());
   for (std::map<int, WebMediaPlayerAndroid*>::iterator player_it =
diff --git a/content/renderer/media/android/webmediaplayer_manager_android.h b/content/renderer/media/android/renderer_media_player_manager.h
index 6c1bc9a..3e5e13c 100644
--- a/content/renderer/media/android/webmediaplayer_manager_android.h
+++ b/content/renderer/media/android/renderer_media_player_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_MANAGER_ANDROID_H_
-#define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_MANAGER_ANDROID_H_
+#ifndef CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_PLAYER_MANAGER_H_
+#define CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_PLAYER_MANAGER_H_
 
 #include <map>
 
@@ -23,10 +23,10 @@ class WebMediaPlayerAndroid;
 
 // Class for managing all the WebMediaPlayerAndroid objects in the same
 // RenderView.
-class WebMediaPlayerManagerAndroid {
+class RendererMediaPlayerManager {
  public:
-  WebMediaPlayerManagerAndroid();
-  virtual ~WebMediaPlayerManagerAndroid();
+  RendererMediaPlayerManager();
+  virtual ~RendererMediaPlayerManager();
 
   // Register and unregister a WebMediaPlayerAndroid object.
   int RegisterMediaPlayer(WebMediaPlayerAndroid* player);
@@ -64,9 +64,9 @@ class WebMediaPlayerManagerAndroid {
   // WebFrame of the fullscreen video.
   WebKit::WebFrame* fullscreen_frame_;
 
-  DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerManagerAndroid);
+  DISALLOW_COPY_AND_ASSIGN(RendererMediaPlayerManager);
 };
 
 }  // namespace content
 
-#endif  // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_MANAGER_ANDROID_H_
+#endif  // CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_PLAYER_MANAGER_H_
diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc
index 0b07fe7..db9e807 100644
--- a/content/renderer/media/android/webmediaplayer_android.cc
+++ b/content/renderer/media/android/webmediaplayer_android.cc
@@ -12,7 +12,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "cc/layers/video_layer.h"
 #include "content/renderer/media/android/proxy_media_keys.h"
-#include "content/renderer/media/android/webmediaplayer_manager_android.h"
+#include "content/renderer/media/android/renderer_media_player_manager.h"
 #include "content/renderer/media/android/webmediaplayer_proxy_android.h"
 #include "content/renderer/media/webmediaplayer_delegate.h"
 #include "content/renderer/media/webmediaplayer_util.h"
@@ -64,7 +64,7 @@ WebMediaPlayerAndroid::WebMediaPlayerAndroid(
     WebKit::WebFrame* frame,
     WebKit::WebMediaPlayerClient* client,
     base::WeakPtr<WebMediaPlayerDelegate> delegate,
-    WebMediaPlayerManagerAndroid* manager,
+    RendererMediaPlayerManager* manager,
     WebMediaPlayerProxyAndroid* proxy,
     StreamTextureFactory* factory,
     media::MediaLog* media_log)
diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h
index 2337aa8..ba98ff4 100644
--- a/content/renderer/media/android/webmediaplayer_android.h
+++ b/content/renderer/media/android/webmediaplayer_android.h
@@ -45,7 +45,7 @@ class WebLayerImpl;
 
 namespace content {
 class WebMediaPlayerDelegate;
-class WebMediaPlayerManagerAndroid;
+class RendererMediaPlayerManager;
 class WebMediaPlayerProxyAndroid;
 
 #if defined(GOOGLE_TV)
@@ -74,7 +74,7 @@ class WebMediaPlayerAndroid
       WebKit::WebFrame* frame,
       WebKit::WebMediaPlayerClient* client,
       base::WeakPtr<WebMediaPlayerDelegate> delegate,
-      WebMediaPlayerManagerAndroid* manager,
+      RendererMediaPlayerManager* manager,
       WebMediaPlayerProxyAndroid* proxy,
       StreamTextureFactory* factory,
       media::MediaLog* media_log);
@@ -179,7 +179,7 @@ class WebMediaPlayerAndroid
   // Called when the player is released.
   virtual void OnPlayerReleased();
 
-  // This function is called by the WebMediaPlayerManagerAndroid to pause the
+  // This function is called by the RendererMediaPlayerManager to pause the
   // video and release the media player and surface texture when we switch tabs.
   // However, the actual GlTexture is not released to keep the video screenshot.
   virtual void ReleaseMediaResources();
@@ -323,7 +323,7 @@ class WebMediaPlayerAndroid
   mutable bool did_loading_progress_;
 
   // Manager for managing this object.
-  WebMediaPlayerManagerAndroid* manager_;
+  RendererMediaPlayerManager* manager_;
 
   // Player ID assigned by the |manager_|.
   int player_id_;
diff --git a/content/renderer/media/android/webmediaplayer_proxy_android.cc b/content/renderer/media/android/webmediaplayer_proxy_android.cc
index b476b72..dfff50c 100644
--- a/content/renderer/media/android/webmediaplayer_proxy_android.cc
+++ b/content/renderer/media/android/webmediaplayer_proxy_android.cc
@@ -7,14 +7,14 @@
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "content/common/media/media_player_messages_android.h"
+#include "content/renderer/media/android/renderer_media_player_manager.h"
 #include "content/renderer/media/android/webmediaplayer_android.h"
-#include "content/renderer/media/android/webmediaplayer_manager_android.h"
 
 namespace content {
 
 WebMediaPlayerProxyAndroid::WebMediaPlayerProxyAndroid(
     RenderView* render_view,
-    WebMediaPlayerManagerAndroid* manager)
+    RendererMediaPlayerManager* manager)
     : RenderViewObserver(render_view), manager_(manager) {}
 
 WebMediaPlayerProxyAndroid::~WebMediaPlayerProxyAndroid() {
diff --git a/content/renderer/media/android/webmediaplayer_proxy_android.h b/content/renderer/media/android/webmediaplayer_proxy_android.h
index c67d790..3db9c65 100644
--- a/content/renderer/media/android/webmediaplayer_proxy_android.h
+++ b/content/renderer/media/android/webmediaplayer_proxy_android.h
@@ -18,7 +18,7 @@
 
 namespace content {
 class WebMediaPlayerAndroid;
-class WebMediaPlayerManagerAndroid;
+class RendererMediaPlayerManager;
 
 // This class manages IPC communication between WebMediaPlayerAndroid and the
 // MediaPlayerManagerAndroid in the browser process.
@@ -29,7 +29,7 @@ class WebMediaPlayerProxyAndroid : public RenderViewObserver {
   // WebMediaPlayerAndroid using player IDs.
   WebMediaPlayerProxyAndroid(
       RenderView* render_view,
-      WebMediaPlayerManagerAndroid* manager);
+      RendererMediaPlayerManager* manager);
   virtual ~WebMediaPlayerProxyAndroid();
 
   // RenderViewObserver overrides.
@@ -126,7 +126,7 @@ class WebMediaPlayerProxyAndroid : public RenderViewObserver {
                     const std::vector<uint8>& message,
                     const std::string& destination_url);
 
-  WebMediaPlayerManagerAndroid* manager_;
+  RendererMediaPlayerManager* manager_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerProxyAndroid);
 };
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 95d8e7a..54ecbb0 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -226,9 +226,9 @@
 #include "content/renderer/android/content_detector.h"
 #include "content/renderer/android/email_detector.h"
 #include "content/renderer/android/phone_number_detector.h"
+#include "content/renderer/media/android/renderer_media_player_manager.h"
 #include "content/renderer/media/android/stream_texture_factory_android.h"
 #include "content/renderer/media/android/webmediaplayer_android.h"
-#include "content/renderer/media/android/webmediaplayer_manager_android.h"
 #include "content/renderer/media/android/webmediaplayer_proxy_android.h"
 #include "third_party/WebKit/public/web/WebHitTestResult.h"
 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
@@ -939,7 +939,7 @@ void RenderViewImpl::Initialize(RenderViewImplParams* params) {
 #endif  // defined(OS_MACOSX)
 
 #if defined(OS_ANDROID)
-  media_player_manager_.reset(new WebMediaPlayerManagerAndroid());
+  media_player_manager_.reset(new RendererMediaPlayerManager());
 #endif
 
   // The next group of objects all implement RenderViewObserver, so are deleted
@@ -6022,7 +6022,7 @@ void RenderViewImpl::OnWasHidden() {
   RenderWidget::OnWasHidden();
 
 #if defined(OS_ANDROID)
-  // Inform WebMediaPlayerManagerAndroid to release all media player resources.
+  // Inform RendererMediaPlayerManager to release all media player resources.
   // unless some audio is playing.
   // If something is in progress the resource will not be freed, it will
   // only be freed once the tab is destroyed or if the user navigates away
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index dfd07f2..476d7c7 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -168,7 +168,7 @@ struct FileChooserParams;
 struct RenderViewImplParams;
 
 #if defined(OS_ANDROID)
-class WebMediaPlayerManagerAndroid;
+class RendererMediaPlayerManager;
 class WebMediaPlayerProxyAndroid;
 #endif
 
@@ -254,7 +254,7 @@ class CONTENT_EXPORT RenderViewImpl
   }
 
 #if defined(OS_ANDROID)
-  WebMediaPlayerManagerAndroid* media_player_manager() {
+  RendererMediaPlayerManager* media_player_manager() {
     return media_player_manager_.get();
   }
 #endif
@@ -1464,7 +1464,7 @@ class CONTENT_EXPORT RenderViewImpl
   WebMediaPlayerProxyAndroid* media_player_proxy_;
 
   // The media player manager for managing all the media players on this view.
-  scoped_ptr<WebMediaPlayerManagerAndroid> media_player_manager_;
+  scoped_ptr<RendererMediaPlayerManager> media_player_manager_;
 
   // A date/time picker object for date and time related input elements.
   scoped_ptr<RendererDateTimePicker> date_time_picker_client_;