Add MediaServiceThrottler

content/browser/media/android/media_player_renderer.cc

Index: content/browser/media/android/media_player_renderer.cc
diff --git a/content/browser/media/android/media_player_renderer.cc b/content/browser/media/android/media_player_renderer.cc
index 58d7bfa80db3b9234d48c3883738f18efd989b67..919a797dfcea009c2cfbe5400b9c5abda10fdcce 100644
--- a/content/browser/media/android/media_player_renderer.cc
+++ b/content/browser/media/android/media_player_renderer.cc
@@ -6,6 +6,7 @@
 
 #include <memory>
 
+#include "base/callback_helpers.h"
 #include "content/browser/android/scoped_surface_request_manager.h"
 #include "content/browser/media/android/media_resource_getter_impl.h"
 #include "content/public/browser/browser_context.h"
@@ -14,6 +15,7 @@
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_client.h"
+#include "media/base/android/media_service_throttler.h"
 
 // TODO(tguilbert): Remove this ID once MediaPlayerManager has been deleted
 // and MediaPlayerBridge updated. See comment in header file.
@@ -35,16 +37,35 @@ void MediaPlayerRenderer::Initialize(
     media::RendererClient* client,
     const media::PipelineStatusCB& init_cb) {
   DVLOG(1) << __func__;
+
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(!pending_init_cb_);
+
+  renderer_client_ = client;
+  pending_init_cb_ = init_cb;
+
+  BrowserThread::PostDelayedTask(

[DaleCurtis, 2016/11/08 22:35:40]

Worth skipping post if it's schedule == 0?

[tguilbert, 2016/11/11 03:50:28]

Done.

+      BrowserThread::UI, FROM_HERE,
+      base::Bind(&MediaPlayerRenderer::InitializeInternal,
+                 weak_factory_.GetWeakPtr(), demuxer_stream_provider),
+      media::MediaServiceThrottler::GetInstance()->ScheduleClientCreation());
+}
+
+void MediaPlayerRenderer::InitializeInternal(

[sandersd (OOO until July 31), 2016/11/08 22:53:44]

Rename to make the purpose more clear. Load() may be reasonable in this case?

[tguilbert, 2016/11/11 03:50:28]

I went with an (overly?) explicit name... LMK if you think there is a better way
to say this.

+    media::DemuxerStreamProvider* demuxer_stream_provider) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(pending_init_cb_);
+
   if (demuxer_stream_provider->GetType() !=
       media::DemuxerStreamProvider::Type::URL) {
     DLOG(ERROR) << "DemuxerStreamProvider is not of Type URL";

[sandersd (OOO until July 31), 2016/11/08 22:53:44]

Should this stay in Initialize()?

[tguilbert, 2016/11/11 03:50:28]

Done.

-    init_cb.Run(media::PIPELINE_ERROR_INITIALIZATION_FAILED);
+    base::ResetAndReturn(&pending_init_cb_)
+        .Run(media::PIPELINE_ERROR_INITIALIZATION_FAILED);
     return;
   }
 
   media::MediaUrlParams url_params =
       demuxer_stream_provider->GetMediaUrlParams();
-  renderer_client_ = client;
 
   const std::string user_agent = GetContentClient()->GetUserAgent();
 
@@ -58,7 +79,7 @@ void MediaPlayerRenderer::Initialize(
       true));  // allow_crendentials
 
   media_player_->Initialize();
-  init_cb.Run(media::PIPELINE_OK);
+  base::ResetAndReturn(&pending_init_cb_).Run(media::PIPELINE_OK);
 }
 
 void MediaPlayerRenderer::SetCdm(media::CdmContext* cdm_context,