Numerous fixes to audio/video buffered resource loading.

webkit/glue/media/buffered_resource_loader.h

 // Copyright (c) 2011 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_GLUE_MEDIA_BUFFERED_RESOURCE_LOADER_H_
 #define WEBKIT_GLUE_MEDIA_BUFFERED_RESOURCE_LOADER_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 36 matching lines @@
     kNeverDefer,
     kReadThenDefer,
     kThresholdDefer,
   };
 
   // |url| - URL for the resource to be loaded.
   // |first_byte_position| - First byte to start loading from,
   // |kPositionNotSpecified| for not specified.
   // |last_byte_position| - Last byte to be loaded,
   // |kPositionNotSpecified| for not specified.
+  // |strategy| is the initial loading strategy to use.
+  // |bitrate| is the bitrate of the media, 0 if unknown.
+  // |playback_rate| is the current playback rate of the media.
   BufferedResourceLoader(const GURL& url,
                          int64 first_byte_position,
                          int64 last_byte_position,
+                         DeferStrategy strategy,
+                         int bitrate,
+                         float playback_rate,
                          media::MediaLog* media_log);
 
   // Start the resource loading with the specified URL and range.
   // This method operates in asynchronous mode. Once there's a response from the
   // server, success or fail |callback| is called with the result.
   // |callback| is called with the following values:
   // - net::OK
   //   The request has started successfully.
   // - net::ERR_FAILED
   //   The request has failed because of an error with the network.
@@ skipping 90 matching lines @@
 
   // Sets the bitrate to the given value and updates buffer window
   // accordingly.
   void SetBitrate(int bitrate);
 
  protected:
   friend class base::RefCountedThreadSafe<BufferedResourceLoader>;
   virtual ~BufferedResourceLoader();
 
  private:
+  friend class BufferedDataSourceTest2;
   friend class BufferedResourceLoaderTest;
 
   // Updates the |buffer_|'s forward and backward capacities.
   void UpdateBufferWindow();
 
   // Toggles whether the resource loading is deferred or not.
   // Returns true if a network event was fired.
   bool ToggleDeferring();
 
   // Returns true if we should defer resource loading, based
@@ skipping 108 matching lines @@
   float playback_rate_;
 
   scoped_refptr<media::MediaLog> media_log_;
 
   DISALLOW_COPY_AND_ASSIGN(BufferedResourceLoader);
 };
 
 }  // namespace webkit_glue
 
 #endif  // WEBKIT_GLUE_MEDIA_BUFFERED_RESOURCE_LOADER_H_