Rename DemuxerStreamProvider into MediaResource

content/browser/media/android/media_player_renderer.cc

 // Copyright 2016 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.
 
 #include "content/browser/media/android/media_player_renderer.h"
 
 #include <memory>
 
 #include "base/callback_helpers.h"
 #include "content/browser/android/scoped_surface_request_manager.h"
@@ skipping 22 matching lines @@
 MediaPlayerRenderer::MediaPlayerRenderer(RenderFrameHost* render_frame_host)
     : render_frame_host_(render_frame_host),
       duration_(media::kInfiniteDuration),
       has_error_(false),
       weak_factory_(this) {}
 
 MediaPlayerRenderer::~MediaPlayerRenderer() {
   CancelScopedSurfaceRequest();
 }
 
-void MediaPlayerRenderer::Initialize(
-    media::DemuxerStreamProvider* demuxer_stream_provider,
-    media::RendererClient* client,
-    const media::PipelineStatusCB& init_cb) {
+void MediaPlayerRenderer::Initialize(media::MediaResource* media_resource,
+                                     media::RendererClient* client,
+                                     const media::PipelineStatusCB& init_cb) {
   DVLOG(1) << __func__;
 
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   renderer_client_ = client;
 
-  if (demuxer_stream_provider->GetType() !=
-      media::DemuxerStreamProvider::Type::URL) {
-    DLOG(ERROR) << "DemuxerStreamProvider is not of Type URL";
+  if (media_resource->GetType() != media::MediaResource::Type::URL) {
+    DLOG(ERROR) << "MediaResource is not of Type URL";
     init_cb.Run(media::PIPELINE_ERROR_INITIALIZATION_FAILED);
     return;
   }
 
   base::TimeDelta creation_delay =
       media::MediaServiceThrottler::GetInstance()->GetDelayForClientCreation();
 
   if (creation_delay.is_zero()) {
-    CreateMediaPlayer(demuxer_stream_provider->GetMediaUrlParams(), init_cb);
+    CreateMediaPlayer(media_resource->GetMediaUrlParams(), init_cb);
     return;
   }
 
   BrowserThread::PostDelayedTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&MediaPlayerRenderer::CreateMediaPlayer,
                  weak_factory_.GetWeakPtr(),
-                 demuxer_stream_provider->GetMediaUrlParams(), init_cb),
+                 media_resource->GetMediaUrlParams(), init_cb),
       creation_delay);
 }
 
 void MediaPlayerRenderer::CreateMediaPlayer(
     const media::MediaUrlParams& url_params,
     const media::PipelineStatusCB& init_cb) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   const std::string user_agent = GetContentClient()->GetUserAgent();
 
@@ skipping 188 matching lines @@
 void MediaPlayerRenderer::CancelScopedSurfaceRequest() {
   if (!surface_request_token_)
     return;
 
   ScopedSurfaceRequestManager::GetInstance()->UnregisterScopedSurfaceRequest(
       surface_request_token_);
   surface_request_token_ = base::UnguessableToken();
 }
 
 }  // namespace content