Merge 105121 - Numerous fixes to audio/video buffered resource loading.

webkit/glue/media/simple_data_source.cc

 // 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.
 
 #include "webkit/glue/media/simple_data_source.h"
 
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "media/base/filter_host.h"
 #include "media/base/media_log.h"
@@ skipping 126 matching lines @@
 
 bool SimpleDataSource::GetSize(int64* size_out) {
   *size_out = size_;
   return true;
 }
 
 bool SimpleDataSource::IsStreaming() {
   return false;
 }
 
-void SimpleDataSource::SetPreload(media::Preload preload) {}
+void SimpleDataSource::SetPreload(media::Preload preload) {
+}
+
+void SimpleDataSource::SetBitrate(int bitrate) {
+}
 
 void SimpleDataSource::SetURLLoaderForTest(WebKit::WebURLLoader* mock_loader) {
   url_loader_.reset(mock_loader);
   keep_test_loader_ = true;
 }
 
 void SimpleDataSource::willSendRequest(
     WebKit::WebURLLoader* loader,
     WebKit::WebURLRequest& newRequest,
     const WebKit::WebURLResponse& redirectResponse) {
@@ skipping 193 matching lines @@
 void SimpleDataSource::UpdateHostState() {
   if (host()) {
     host()->SetTotalBytes(size_);
     host()->SetBufferedBytes(size_);
     // If scheme is file or data, say we are loaded.
     host()->SetLoaded(url_.SchemeIsFile() || url_.SchemeIs(kDataScheme));
   }
 }
 
 }  // namespace webkit_glue