MediaResource refactoring to support multiple streams

media/remoting/remote_renderer_impl.h

 // 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.
 
 #ifndef MEDIA_REMOTING_REMOTE_RENDERER_IMPL_H_
 #define MEDIA_REMOTING_REMOTE_RENDERER_IMPL_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 63 matching lines @@
   // media thread to avoid threading race condition.
   static void RequestUpdateInterstitialOnMainThread(
       scoped_refptr<base::SingleThreadTaskRunner> media_task_runner,
       base::WeakPtr<RemoteRendererImpl> remote_renderer_impl,
       const base::Optional<SkBitmap>& background_image,
       const gfx::Size& canvas_size,
       RemotingInterstitialType interstitial_type);
 
  public:
   // media::Renderer implementation.
-  void Initialize(DemuxerStreamProvider* demuxer_stream_provider,
+  void Initialize(MediaResource* media_resource,
                   media::RendererClient* client,
                   const PipelineStatusCB& init_cb) final;
   void SetCdm(CdmContext* cdm_context,
               const CdmAttachedCB& cdm_attached_cb) final;
   void Flush(const base::Closure& flush_cb) final;
   void StartPlayingFrom(base::TimeDelta time) final;
   void SetPlaybackRate(double playback_rate) final;
   void SetVolume(float volume) final;
   base::TimeDelta GetMediaTime() final;
 
@@ skipping 67 matching lines @@
   const scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
   const scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_;
 
   // Current renderer playback time information.
   base::TimeDelta current_media_time_;
   base::TimeDelta current_max_time_;
   // Both |current_media_time_| and |current_max_time_| should be protected by
   // lock because it can be accessed from both media and render main thread.
   base::Lock time_lock_;
 
-  DemuxerStreamProvider* demuxer_stream_provider_;
+  MediaResource* media_resource_;
   media::RendererClient* client_;
   std::unique_ptr<remoting::RemoteDemuxerStreamAdapter>
       audio_demuxer_stream_adapter_;
   std::unique_ptr<remoting::RemoteDemuxerStreamAdapter>
       video_demuxer_stream_adapter_;
 
   // Component to establish mojo remoting service on browser process.
   const base::WeakPtr<RemotingRendererController> remoting_renderer_controller_;
   // Broker class to process incoming and outgoing RPC message.
   const base::WeakPtr<remoting::RpcBroker> rpc_broker_;
@@ skipping 52 matching lines @@
   bool is_waiting_for_buffering_ = true;
 
   base::WeakPtrFactory<RemoteRendererImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RemoteRendererImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_REMOTING_REMOTE_RENDERER_IMPL_H_