Rename MediaPlayerBridgeManager to MediaPlayerManager

Rename MediaPlayerBridgeManager to MediaPlayerManager

To support MediaSource, i am planning to introduce MediaSourceBridge on android.
Both MediaSourceBridge and MediaPlayerBridge will inherit from a common class: MediaPlayerAndroid.
As a result of this plan, MediaPlayerBridgeManager is no longer a good name for this common class.
This CL includes the following changes:
1. rename MediaPlayerBridgeManager to MediaPlayerManager, and MediaPlayerManagerAndroid to MediaPlayerManagerImpl.
2. remove MediaPlayerBridgeManagerImpl as it is no longer being used.
3. MediaResouceGetter is now owned by MediaPlayerManagerImpl.
   so we no longer need to create a separate MediaResourceGetter for each player.

BUG=233420
R=jam@chromium.org, scherkus@chromium.org, yfriedman@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=197626

[qinmin, 2013-04-26 23:21:41]

PTAL

[Yaron, 2013-04-29 20:37:07]

lgtm

[scherkus (not reviewing), 2013-04-30 05:05:48]

lgtm w/ nits

https://codereview.chromium.org/14314020/diff/1/content/browser/android/media...
File content/browser/android/media_player_manager_impl.h (right):

https://codereview.chromium.org/14314020/diff/1/content/browser/android/media...
content/browser/android/media_player_manager_impl.h:25: // This class manages
all the MediaPlayerBridge objects. It receives
update docs? (should they still mention MediaPlayerBridge?)

https://codereview.chromium.org/14314020/diff/1/media/base/android/media_play...
File media/base/android/media_player_manager.h (right):

https://codereview.chromium.org/14314020/diff/1/media/base/android/media_play...
media/base/android/media_player_manager.h:16: // It is implemented by
content::MediaPlayerManagerImpl.
update docs? (should it still mention MediaPlayerBridge?)

[qinmin, 2013-04-30 16:38:02]

https://codereview.chromium.org/14314020/diff/1/content/browser/android/media...
File content/browser/android/media_player_manager_impl.h (right):

https://codereview.chromium.org/14314020/diff/1/content/browser/android/media...
content/browser/android/media_player_manager_impl.h:25: // This class manages
all the MediaPlayerBridge objects. It receives
will update this once I add the MediaPlayerAndroid class. Currently everything
is still inherited from MediaPlayerBridge.

On 2013/04/30 05:05:49, scherkus wrote:
> update docs? (should they still mention MediaPlayerBridge?)

https://codereview.chromium.org/14314020/diff/1/media/base/android/media_play...
File media/base/android/media_player_manager.h (right):

https://codereview.chromium.org/14314020/diff/1/media/base/android/media_play...
media/base/android/media_player_manager.h:16: // It is implemented by
content::MediaPlayerManagerImpl.
will update docs after MediaPlayerAndroid is added.

On 2013/04/30 05:05:49, scherkus wrote:
> update docs? (should it still mention MediaPlayerBridge?)

[qinmin, 2013-04-30 16:42:15]

hi, @jam, would you please help me take a look at
content/content_browser.gypi
content/renderer/render_view_impl.h
content/renderer/render_view_impl.cc

I need the OWNER stamp, thanks

[jam, 2013-05-01 01:36:16]

On 2013/04/30 16:42:15, qinmin wrote:
> hi, @jam, would you please help me take a look at
> content/content_browser.gypi
> content/renderer/render_view_impl.h
> content/renderer/render_view_impl.cc
> 
> I need the OWNER stamp, thanks

lgtm

[commit-bot: I haz the power, 2013-05-01 02:10:12]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/qinmin@chromium.org/14314020/1

[commit-bot: I haz the power, 2013-05-01 02:10:17]

Failed to apply patch for content/browser/android/media_player_manager_impl.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  A         content/browser/android/media_player_manager_impl.cc
  Copied content/browser/android/media_player_manager_android.cc ->
content/browser/android/media_player_manager_impl.cc
  patching file content/browser/android/media_player_manager_impl.cc
  Hunk #2 succeeded at 21 with fuzz 1.
  Hunk #4 succeeded at 60 (offset 4 lines).
  Hunk #5 succeeded at 69 (offset 4 lines).
  Hunk #6 succeeded at 78 (offset 4 lines).
  Hunk #7 succeeded at 97 (offset 4 lines).
  Hunk #8 FAILED at 102.
  Hunk #9 FAILED at 113.
  Hunk #10 succeeded at 184 (offset 10 lines).
  Hunk #11 succeeded at 193 (offset 10 lines).
  Hunk #12 succeeded at 205 (offset 10 lines).
  Hunk #13 succeeded at 214 (offset 10 lines).
  Hunk #14 succeeded at 237 (offset 10 lines).
  Hunk #15 succeeded at 265 (offset 26 lines).
  Hunk #16 succeeded at 274 (offset 26 lines).
  Hunk #17 succeeded at 287 (offset 26 lines).
  Hunk #18 succeeded at 307 (offset 26 lines).
  Hunk #19 FAILED at 301.
  Hunk #20 succeeded at 373 (offset 34 lines).
  3 out of 20 hunks FAILED -- saving rejects to file
content/browser/android/media_player_manager_impl.cc.rej

Patch:   NR 
content/browser/android/media_player_manager_android.cc->content/browser/android/media_player_manager_impl.cc
Index: content/browser/android/media_player_manager_impl.cc
diff --git a/content/browser/android/media_player_manager_android.cc
b/content/browser/android/media_player_manager_impl.cc
similarity index 72%
rename from content/browser/android/media_player_manager_android.cc
rename to content/browser/android/media_player_manager_impl.cc
index
e024ba1cc4d42599720047cd5022c23c0c95caaf..ba96279fd569e17de7100c3a70b737a063913fe4
100644
--- a/content/browser/android/media_player_manager_android.cc
+++ b/content/browser/android/media_player_manager_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/android/media_player_manager_android.h"
+#include "content/browser/android/media_player_manager_impl.h"
 
 #include "base/bind.h"
 #include "content/browser/android/media_resource_getter_impl.h"
@@ -21,7 +21,7 @@ static const int kMediaPlayerThreshold = 1;
 
 namespace content {
 
-MediaPlayerManagerAndroid::MediaPlayerManagerAndroid(
+MediaPlayerManagerImpl::MediaPlayerManagerImpl(
     RenderViewHost* render_view_host)
     : RenderViewHostObserver(render_view_host),
       ALLOW_THIS_IN_INITIALIZER_LIST(video_view_(this)),
@@ -29,11 +29,11 @@ MediaPlayerManagerAndroid::MediaPlayerManagerAndroid(
       web_contents_(WebContents::FromRenderViewHost(render_view_host)) {
 }
 
-MediaPlayerManagerAndroid::~MediaPlayerManagerAndroid() {}
+MediaPlayerManagerImpl::~MediaPlayerManagerImpl() {}
 
-bool MediaPlayerManagerAndroid::OnMessageReceived(const IPC::Message& msg) {
+bool MediaPlayerManagerImpl::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(MediaPlayerManagerAndroid, msg)
+  IPC_BEGIN_MESSAGE_MAP(MediaPlayerManagerImpl, msg)
     IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_EnterFullscreen, OnEnterFullscreen)
     IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_ExitFullscreen, OnExitFullscreen)
     IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerInitialize, OnInitialize)
@@ -56,7 +56,7 @@ bool MediaPlayerManagerAndroid::OnMessageReceived(const
IPC::Message& msg) {
   return handled;
 }
 
-void MediaPlayerManagerAndroid::FullscreenPlayerPlay() {
+void MediaPlayerManagerImpl::FullscreenPlayerPlay() {
   MediaPlayerBridge* player = GetFullscreenPlayer();
   if (player) {
     player->Start();
@@ -65,7 +65,7 @@ void MediaPlayerManagerAndroid::FullscreenPlayerPlay() {
   }
 }
 
-void MediaPlayerManagerAndroid::FullscreenPlayerPause() {
+void MediaPlayerManagerImpl::FullscreenPlayerPause() {
   MediaPlayerBridge* player = GetFullscreenPlayer();
   if (player) {
     player->Pause();
@@ -74,13 +74,13 @@ void MediaPlayerManagerAndroid::FullscreenPlayerPause() {
   }
 }
 
-void MediaPlayerManagerAndroid::FullscreenPlayerSeek(int msec) {
+void MediaPlayerManagerImpl::FullscreenPlayerSeek(int msec) {
   MediaPlayerBridge* player = GetFullscreenPlayer();
   if (player)
     player->SeekTo(base::TimeDelta::FromMilliseconds(msec));
 }
 
-void MediaPlayerManagerAndroid::ExitFullscreen(bool release_media_player) {
+void MediaPlayerManagerImpl::ExitFullscreen(bool release_media_player) {
   Send(new MediaPlayerMsg_DidExitFullscreen(
       routing_id(), fullscreen_player_id_));
   MediaPlayerBridge* player = GetFullscreenPlayer();
@@ -93,7 +93,7 @@ void MediaPlayerManagerAndroid::ExitFullscreen(bool
release_media_player) {
     player->SetVideoSurface(NULL);
 }
 
-void MediaPlayerManagerAndroid::SetVideoSurface(jobject surface) {
+void MediaPlayerManagerImpl::SetVideoSurface(jobject surface) {
   MediaPlayerBridge* player = GetFullscreenPlayer();
   if (player) {
     player->SetVideoSurface(surface);
@@ -102,7 +102,7 @@ void MediaPlayerManagerAndroid::SetVideoSurface(jobject
surface) {
   }
 }
 
-void MediaPlayerManagerAndroid::OnInitialize(
+void MediaPlayerManagerImpl::OnInitialize(
     int player_id, const GURL& url, const GURL& first_party_for_cookies) {
   for (ScopedVector<MediaPlayerBridge>::iterator it = players_.begin();
       it != players_.end(); ++it) {
@@ -113,58 +113,65 @@ void MediaPlayerManagerAndroid::OnInitialize(
   }
 
   RenderProcessHost* host = render_view_host()->GetProcess();
-  BrowserContext* context = host->GetBrowserContext();
-  StoragePartition* partition = host->GetStoragePartition();
-  fileapi::FileSystemContext* file_system_context =
-      partition ? partition->GetFileSystemContext() : NULL;
   players_.push_back(new MediaPlayerBridge(
       player_id, url, first_party_for_cookies,
-      new MediaResourceGetterImpl(context, file_system_context, host->GetID(),
-                                  routing_id()),
-      context->IsOffTheRecord(), this,
-      base::Bind(&MediaPlayerManagerAndroid::OnError, base::Unretained(this)),
-      base::Bind(&MediaPlayerManagerAndroid::OnVideoSizeChanged,
+      host->GetBrowserContext()->IsOffTheRecord(), this,
+      base::Bind(&MediaPlayerManagerImpl::OnError, base::Unretained(this)),
+      base::Bind(&MediaPlayerManagerImpl::OnVideoSizeChanged,
                  base::Unretained(this)),
-      base::Bind(&MediaPlayerManagerAndroid::OnBufferingUpdate,
+      base::Bind(&MediaPlayerManagerImpl::OnBufferingUpdate,
                  base::Unretained(this)),
-      base::Bind(&MediaPlayerManagerAndroid::OnMediaMetadataChanged,
+      base::Bind(&MediaPlayerManagerImpl::OnMediaMetadataChanged,
                  base::Unretained(this)),
-      base::Bind(&MediaPlayerManagerAndroid::OnPlaybackComplete,
+      base::Bind(&MediaPlayerManagerImpl::OnPlaybackComplete,
                  base::Unretained(this)),
-      base::Bind(&MediaPlayerManagerAndroid::OnSeekComplete,
+      base::Bind(&MediaPlayerManagerImpl::OnSeekComplete,
                  base::Unretained(this)),
-      base::Bind(&MediaPlayerManagerAndroid::OnTimeUpdate,
+      base::Bind(&MediaPlayerManagerImpl::OnTimeUpdate,
                  base::Unretained(this)),
-      base::Bind(&MediaPlayerManagerAndroid::OnMediaInterrupted,
+      base::Bind(&MediaPlayerManagerImpl::OnMediaInterrupted,
                  base::Unretained(this))));
 }
 
-void MediaPlayerManagerAndroid::OnStart(int player_id) {
+media::MediaResourceGetter* MediaPlayerManagerImpl::GetMediaResourceGetter() {
+  if (!media_resource_getter_.get()) {
+    RenderProcessHost* host = render_view_host()->GetProcess();
+    BrowserContext* context = host->GetBrowserContext();
+    StoragePartition* partition = host->GetStoragePartition();
+    fileapi::FileSystemContext* file_system_context =
+        partition ? partition->GetFileSystemContext() : NULL;
+    media_resource_getter_.reset(new MediaResourceGetterImpl(
+        context, file_system_context, host->GetID(), routing_id()));
+  }
+  return media_resource_getter_.get();
+}
+
+void MediaPlayerManagerImpl::OnStart(int player_id) {
   MediaPlayerBridge* player = GetPlayer(player_id);
   if (player)
     player->Start();
 }
 
-void MediaPlayerManagerAndroid::OnSeek(int player_id, base::TimeDelta time) {
+void MediaPlayerManagerImpl::OnSeek(int player_id, base::TimeDelta time) {
   MediaPlayerBridge* player = GetPlayer(player_id);
   if (player)
     player->SeekTo(time);
 }
 
-void MediaPlayerManagerAndroid::OnPause(int player_id) {
+void MediaPlayerManagerImpl::OnPause(int player_id) {
   MediaPlayerBridge* player = GetPlayer(player_id);
   if (player)
     player->Pause();
 }
 
-void MediaPlayerManagerAndroid::OnEnterFullscreen(int player_id) {
+void MediaPlayerManagerImpl::OnEnterFullscreen(int player_id) {
   DCHECK_EQ(fullscreen_player_id_, -1);
 
   fullscreen_player_id_ = player_id;
   video_view_.CreateContentVideoView();
 }
 
-void MediaPlayerManagerAndroid::OnExitFullscreen(int player_id) {
+void MediaPlayerManagerImpl::OnExitFullscreen(int player_id) {
   if (fullscreen_player_id_ == player_id) {
     MediaPlayerBridge* player = GetPlayer(player_id);
     if (player)
@@ -174,7 +181,7 @@ void MediaPlayerManagerAndroid::OnExitFullscreen(int
player_id) {
   }
 }
 
-void MediaPlayerManagerAndroid::OnReleaseResources(int player_id) {
+void MediaPlayerManagerImpl::OnReleaseResources(int player_id) {
   MediaPlayerBridge* player = GetPlayer(player_id);
   // Don't release the fullscreen player when tab visibility changes,
   // it will be released when user hit the back/home button or when
@@ -183,7 +190,7 @@ void MediaPlayerManagerAndroid::OnReleaseResources(int
player_id) {
     player->Release();
 }
 
-void MediaPlayerManagerAndroid::OnDestroyPlayer(int player_id) {
+void MediaPlayerManagerImpl::OnDestroyPlayer(int player_id) {
   for (ScopedVector<Media…
(message too large)

[commit-bot: I haz the power, 2013-05-01 04:20:15]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/qinmin@chromium.org/14314020/12029

[commit-bot: I haz the power, 2013-05-01 06:30:39]

Retried try job too often on win7_aura for step(s) content_browsertests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win7_aura&...

[commit-bot: I haz the power, 2013-05-01 06:44:01]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/qinmin@chromium.org/14314020/12029

[commit-bot: I haz the power, 2013-05-01 10:21:01]

Retried try job too often on win7_aura for step(s) interactive_ui_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win7_aura&...

[commit-bot: I haz the power, 2013-05-01 13:52:46]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/qinmin@chromium.org/14314020/12029

[qinmin, 2013-05-01 16:09:18]

Committed patchset #4 manually as r197626 (presubmit successful).