Fold WebDataSource into BufferedDataSource.

webkit/media/buffered_resource_loader.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_BUFFERED_RESOURCE_LOADER_H_
 #define WEBKIT_MEDIA_BUFFERED_RESOURCE_LOADER_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer.h"
 #include "googleurl/src/gurl.h"
 #include "media/base/seekable_buffer.h"
 #include "net/base/file_stream.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLLoader.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLLoaderClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
 #include "webkit/media/active_loader.h"
-#include "webkit/media/web_data_source.h"
-#include "webkit/media/webmediaplayer_impl.h"
 
 namespace media {
 class MediaLog;
 }
 
 namespace webkit_media {
 
 const int64 kPositionNotSpecified = -1;
 
 const char kHttpScheme[] = "http";
@@ skipping 119 matching lines @@
   virtual void didReceiveCachedMetadata(
       WebKit::WebURLLoader* loader,
       const char* data, int dataLength);
   virtual void didFinishLoading(
       WebKit::WebURLLoader* loader,
       double finishTime);
   virtual void didFail(
       WebKit::WebURLLoader* loader,
       const WebKit::WebURLError&);
 
+  // Returns true if the media resource has a single origin, false otherwise.
+  // Only valid to call after Start() has completed.
   bool HasSingleOrigin() const;
 
   // Sets the defer strategy to the given value.
   void UpdateDeferStrategy(DeferStrategy strategy);
 
   // Sets the playback rate to the given value and updates buffer window
   // accordingly.
   void SetPlaybackRate(float playback_rate);
 
   // Sets the bitrate to the given value and updates buffer window
@@ skipping 127 matching lines @@
   float playback_rate_;
 
   scoped_refptr<media::MediaLog> media_log_;
 
   DISALLOW_COPY_AND_ASSIGN(BufferedResourceLoader);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_BUFFERED_RESOURCE_LOADER_H_