Remove MediaThrottler and MediaThrottleInfoBar

content/browser/media/android/browser_media_player_manager.cc

Index: content/browser/media/android/browser_media_player_manager.cc
diff --git a/content/browser/media/android/browser_media_player_manager.cc b/content/browser/media/android/browser_media_player_manager.cc
index 36ae2e555651ef8f23c952696554f954ef47f4c4..d6ee4c61c633a0d9da02fc0510838c731bbf69bc 100644
--- a/content/browser/media/android/browser_media_player_manager.cc
+++ b/content/browser/media/android/browser_media_player_manager.cc
@@ -11,7 +11,6 @@
 #include "base/memory/singleton.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/media/android/media_resource_getter_impl.h"
-#include "content/browser/media/android/media_throttler.h"
 #include "content/browser/media/android/media_web_contents_observer_android.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
@@ -71,7 +70,11 @@ BrowserMediaPlayerManager* BrowserMediaPlayerManager::Create(
     RenderFrameHost* rfh) {
   if (g_factory)
     return g_factory(rfh);
-  return new BrowserMediaPlayerManager(rfh);
+  // |g_factory| should always be set to create a RemoteMediaPlayerManager,

[tguilbert, 2017/04/04 23:27:47]

DaleCurtis/Whywhat: can you think of any counter examples?

[DaleCurtis, 2017/04/04 23:38:30]

The only way one could be created is through this path when no factory is set:

https://cs.chromium.org/chromium/src/content/browser/media/android/media_web_...

There's only one instance of this call though, should we just replace it with
new RemoteMediaPlayerManager() to be explicit?

https://cs.chromium.org/chromium/src/content/browser/media/android/media_web_...

Then you can delete this whole method and all the factory fluff.

[whywhat, 2017/04/04 23:41:55]

Not, apart from webview.

[tguilbert, 2017/04/06 20:50:59]

Unfortunately, after some looking into this, I don't think we can remove the
factory fluff right away. RemoteMediaPlayerBridge is in src/chrome, and
including it in src/content code violates layering.

+  // since RegisterFactory() should always be called from
+  // ChromeMainDelegateAndroid::BasicStartupComplete.
+  NOTREACHED();

[tguilbert, 2017/04/04 23:27:47]

Is this unnecessary? I am just trying to catch any places where we might
accidentally still be creating a BrowserMediaPlayerManager directly.

Will webview still end up with a RemoteMediaPlayerManager?

[whywhat, 2017/04/04 23:41:55]

I hope webview doesn't use BMPM at all now after Spitzer.
Otherwise, it shouldn't use RMPM as they don't support casting anything.

Can you just call RMPM::Create directly from here somehow?

[tguilbert, 2017/04/06 20:50:59]

I get linking issues, due to it being in src/chrome.

My concern is that, while there is no real use for the BMPM in webview, the
following path might still trigger it's creation:
https://cs.chromium.org/chromium/src/media/blink/webmediaplayer_impl.cc?l=426
https://cs.chromium.org/chromium/src/media/blink/webmediaplayer_cast_android....
https://cs.chromium.org/chromium/src/content/renderer/media/android/renderer_...
https://cs.chromium.org/chromium/src/content/browser/media/android/media_web_...

The easy way to check would be to just start a webview instance and see if we
run into the NOTREACHED, but I will not be able to check until tomorrow.

[tguilbert, 2017/04/10 23:47:35]

I did end up double checking this on Friday.
Webview tests that involved video ended up crashing when this nullptr/NOTREACHED
was here.

I am following Dale's suggestion and dropping IPC messages whenever webview
tries to instanciate a BMPM

+  return nullptr;
 }
 
 #if !defined(USE_AURA)
@@ -372,13 +375,12 @@ void BrowserMediaPlayerManager::OnStart(int player_id) {
   if (!player)
     return;
 
-  if (RequestDecoderResources(player_id, false)) {
-    StartInternal(player_id);
-  } else if (WebContentsDelegate* delegate = web_contents_->GetDelegate()){
-    delegate->RequestMediaDecodePermission(
-        web_contents_,
-        base::Bind(&BrowserMediaPlayerManager::OnPlaybackPermissionGranted,
-                   weak_ptr_factory_.GetWeakPtr(), player_id));
+  RequestDecoderResources(player_id, false);
+
+  player->Start();
+  if (fullscreen_player_id_ == player_id && fullscreen_player_is_released_) {

[DaleCurtis, 2017/04/04 23:38:30]

I think all the fullscreen player stuff can be deleted too. We don't support
SurfaceView for MediaPlayerRenderer right?

[tguilbert, 2017/04/06 20:50:59]

Agreed, and yes, we no longer use SurfaceView. However, I haven't looked much
into the fullscreen code, and I think this is beyond the scope of this CL. I
opened crbug/709200 to formally track some of this work.

+    video_view_->OpenVideo();
+    fullscreen_player_is_released_ = false;
   }
 }
 
@@ -484,9 +486,6 @@ std::unique_ptr<MediaPlayerAndroid> BrowserMediaPlayerManager::SwapPlayer(
 
 bool BrowserMediaPlayerManager::RequestDecoderResources(
     int player_id, bool temporary) {
-  if (!MediaThrottler::GetInstance()->RequestDecoderResources())
-    return false;
-
   ActivePlayerMap::iterator it;
   // The player is already active, ignore it. A long running player should not
   // request temporary permissions.
@@ -525,7 +524,6 @@ void BrowserMediaPlayerManager::OnDecoderResourcesReleased(int player_id) {
     return;
 
   active_players_.erase(player_id);
-  MediaThrottler::GetInstance()->OnDecodeRequestFinished();
 }
 
 int BrowserMediaPlayerManager::RoutingID() {
@@ -545,24 +543,4 @@ void BrowserMediaPlayerManager::ReleasePlayer(MediaPlayerAndroid* player) {
   player->Release();
 }
 
-void BrowserMediaPlayerManager::OnPlaybackPermissionGranted(
-    int player_id, bool granted) {
-  if (!granted)
-    return;
-
-  MediaThrottler::GetInstance()->Reset();
-  StartInternal(player_id);
-}
-
-void BrowserMediaPlayerManager::StartInternal(int player_id) {
-  MediaPlayerAndroid* player = GetPlayer(player_id);
-  if (!player)
-    return;
-  player->Start();
-  if (fullscreen_player_id_ == player_id && fullscreen_player_is_released_) {
-    video_view_->OpenVideo();
-    fullscreen_player_is_released_ = false;
-  }
-}
-
 }  // namespace content