Revert 118546 because it caused PrerenderHTML5VideoNetwork to timeout on windows and linux

webkit/media/buffered_data_source.cc

 // 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.
 
 #include "webkit/media/buffered_data_source.h"
 
 #include "base/bind.h"
 #include "media/base/media_log.h"
 #include "net/base/net_errors.h"
 
@@ skipping 534 matching lines @@
 
   if (error > 0) {
     // If a position error code is received, read was successful. So copy
     // from intermediate read buffer to the target read buffer.
     memcpy(read_buffer_, intermediate_read_buffer_.get(), error);
   } else if (error == 0 && total_bytes_ == kPositionNotSpecified) {
     // We've reached the end of the file and we didn't know the total size
     // before. Update the total size so Read()s past the end of the file will
     // fail like they would if we had known the file size at the beginning.
     total_bytes_ = loader_->instance_size();
-    if (total_bytes_ != kPositionNotSpecified)
-      buffered_bytes_ = total_bytes_;
 
-    UpdateHostState_Locked();
+    if (host() && total_bytes_ != kPositionNotSpecified) {
+      host()->SetTotalBytes(total_bytes_);
+      host()->SetBufferedBytes(total_bytes_);
+    }
   }
   DoneRead_Locked(error);
 }
 
 void BufferedDataSource::NetworkEventCallback() {
   DCHECK(MessageLoop::current() == render_loop_);
   DCHECK(loader_.get());
 
   // In case of non-HTTP request we don't need to report network events,
   // so return immediately.
@@ skipping 12 matching lines @@
   // method to prevent bad things from happening. The reason behind this is
   // that we cannot guarantee tasks on render thread have completely stopped
   // when we receive the Stop() method call. So only way to solve this is to
   // let tasks on render thread to run but make sure they don't call outside
   // this object when Stop() method is ever called. Locking this method is safe
   // because |lock_| is only acquired in tasks on render thread.
   base::AutoLock auto_lock(lock_);
   if (stop_signal_received_)
     return;
 
-  is_downloading_data_ = is_downloading_data;
+  if (is_downloading_data != is_downloading_data_) {
+    is_downloading_data_ = is_downloading_data;
+    if (host())
+      host()->SetNetworkActivity(is_downloading_data);
+  }
+
   buffered_bytes_ = buffered_position + 1;
-
-  UpdateHostState_Locked();
+  if (host())
+    host()->SetBufferedBytes(buffered_bytes_);
 }
 
 void BufferedDataSource::UpdateHostState_Locked() {
   // Called from various threads, under lock.
   lock_.AssertAcquired();
 
   if (!host())
     return;
 
   if (total_bytes_ != kPositionNotSpecified)
     host()->SetTotalBytes(total_bytes_);
-  host()->SetNetworkActivity(is_downloading_data_);
   host()->SetBufferedBytes(buffered_bytes_);
 }
 
 }  // namespace webkit_media