Fold WebDataSource into BufferedDataSource.

webkit/media/webmediaplayer_proxy.h

 // Copyright (c) 2012 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 WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_
 #define WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_
 
 #include <list>
 
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "media/base/pipeline.h"
 #include "media/filters/chunk_demuxer_client.h"
+#include "webkit/media/buffered_data_source.h"
 #include "webkit/media/skcanvas_video_renderer.h"
-#include "webkit/media/web_data_source.h"
 
 class SkCanvas;
 
 namespace base {
 class MessageLoopProxy;
 }
 
 namespace gfx {
 class Rect;
 }
 
 namespace media {
 class VideoFrame;
 class VideoRendererBase;
 }
 
 namespace webkit_media {
 
 class WebMediaPlayerImpl;
 
 // Acts as a thread proxy between the various threads used for multimedia and
 // the render thread that WebMediaPlayerImpl is running on.
 class WebMediaPlayerProxy
     : public base::RefCountedThreadSafe<WebMediaPlayerProxy>,
       public media::ChunkDemuxerClient {
  public:
   WebMediaPlayerProxy(const scoped_refptr<base::MessageLoopProxy>& render_loop,
                       WebMediaPlayerImpl* webmediaplayer);
-  const scoped_refptr<WebDataSource>& data_source() {
+  const scoped_refptr<BufferedDataSource>& data_source() {
     return data_source_;
   }
-  void set_data_source(const scoped_refptr<WebDataSource>& data_source) {
+  void set_data_source(const scoped_refptr<BufferedDataSource>& data_source) {
     data_source_ = data_source;
   }
 
   // TODO(scherkus): remove this once VideoRendererBase::PaintCB passes
   // ownership of the VideoFrame http://crbug.com/108435
   void set_frame_provider(media::VideoRendererBase* frame_provider) {
     frame_provider_ = frame_provider;
   }
 
   // Methods for Filter -> WebMediaPlayerImpl communication.
@@ skipping 51 matching lines @@
   // Notify |webmediaplayer_| that there's a network event.
   void NetworkEventTask(media::NetworkEvent type);
 
   // Inform |webmediaplayer_| whether the video content is opaque.
   void SetOpaqueTask(bool opaque);
 
   // The render message loop where WebKit lives.
   scoped_refptr<base::MessageLoopProxy> render_loop_;
   WebMediaPlayerImpl* webmediaplayer_;
 
-  scoped_refptr<WebDataSource> data_source_;
+  scoped_refptr<BufferedDataSource> data_source_;
   scoped_refptr<media::VideoRendererBase> frame_provider_;
   SkCanvasVideoRenderer video_renderer_;
 
   base::Lock lock_;
   int outstanding_repaints_;
 
   scoped_refptr<media::ChunkDemuxer> chunk_demuxer_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerProxy);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_