Changing constructor of BufferedDataSource to accept GURL and CORSMode

content/renderer/media/buffered_data_source.h

Index: content/renderer/media/buffered_data_source.h
diff --git a/content/renderer/media/buffered_data_source.h b/content/renderer/media/buffered_data_source.h
index 40acdcd0d9863130e8fe652b74031b3e7fc8e4fc..19b246274fe26fada57161ae071b3dff2cff38ba 100644
--- a/content/renderer/media/buffered_data_source.h
+++ b/content/renderer/media/buffered_data_source.h
@@ -50,24 +50,23 @@ class CONTENT_EXPORT BufferedDataSource : public media::DataSource {
  public:
   typedef base::Callback<void(bool)> DownloadingCB;
 
-  // Buffered byte range changes will be reported to |host|. |downloading_cb|
-  // will be called whenever the downloading/paused state of the source changes.
-  BufferedDataSource(const scoped_refptr<base::MessageLoopProxy>& render_loop,
+  // |url| and |cors_mode| are passed to the object. Buffered byte range changes
+  // will be reported to |host|. |downloading_cb| will be called whenever the
+  // downloading/paused state of the source changes.
+  BufferedDataSource(const GURL& url,
+                     BufferedResourceLoader::CORSMode cors_mode,
+                     const scoped_refptr<base::MessageLoopProxy>& render_loop,
                      blink::WebFrame* frame,
                      media::MediaLog* media_log,
                      BufferedDataSourceHost* host,
                      const DownloadingCB& downloading_cb);
   virtual ~BufferedDataSource();
 
-  // Initialize this object using |url| and |cors_mode|, executing |init_cb|
-  // with the result of initialization when it has completed.
+  // Executes |init_cb| with the result of initialization when it has completed.
   //
   // Method called on the render thread.
   typedef base::Callback<void(bool)> InitializeCB;
-  void Initialize(
-      const GURL& url,
-      BufferedResourceLoader::CORSMode cors_mode,
-      const InitializeCB& init_cb);
+  void Initialize(const InitializeCB& init_cb);
 
   // Adjusts the buffering algorithm based on the given preload value.
   void SetPreload(Preload preload);
@@ -94,6 +93,9 @@ class CONTENT_EXPORT BufferedDataSource : public media::DataSource {
   void MediaIsPlaying();
   void MediaIsPaused();
 
+  // Returns true if the resource is local.
+  inline bool assume_fully_buffered() { return !url_.SchemeIsHTTPOrHTTPS(); }

[scherkus (not reviewing), 2014/06/02 20:11:23]

nit: don't bother manually specifying "inline" -- the compiler will take of it
if needed

+
   // media::DataSource implementation.
   // Called from demuxer thread.
   virtual void Stop(const base::Closure& closure) OVERRIDE;
@@ -157,10 +159,6 @@ class CONTENT_EXPORT BufferedDataSource : public media::DataSource {
   // determined by reaching EOF.
   int64 total_bytes_;
 
-  // Some resources are assumed to be fully buffered (i.e., file://) so we don't
-  // need to report what |loader_| has buffered.
-  bool assume_fully_buffered_;
-
   // This value will be true if this data source can only support streaming.
   // i.e. range request is not supported.
   bool streaming_;