downloads: Improve download rate estimation.

content/browser/download/download_file_impl.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 "content/browser/download/download_file_impl.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/file_util.h"
@@ skipping 80 matching lines @@
 
 DownloadInterruptReason DownloadFileImpl::AppendDataToFile(
     const char* data, size_t data_len) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   if (!update_timer_->IsRunning()) {
     update_timer_->Start(FROM_HERE,
                          base::TimeDelta::FromMilliseconds(kUpdatePeriodMs),
                          this, &DownloadFileImpl::SendUpdate);
   }
+  rate_estimator_.Increment(data_len);
   return file_.AppendDataToFile(data, data_len);
 }
 
 void DownloadFileImpl::RenameAndUniquify(
     const base::FilePath& full_path,
     const RenameCompletionCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   base::FilePath new_path(full_path);
 
@@ skipping 73 matching lines @@
 
 bool DownloadFileImpl::InProgress() const {
   return file_.in_progress();
 }
 
 int64 DownloadFileImpl::BytesSoFar() const {
   return file_.bytes_so_far();
 }
 
 int64 DownloadFileImpl::CurrentSpeed() const {
-  return file_.CurrentSpeed();
+  return rate_estimator_.GetCountPerSecond();
 }
 
 bool DownloadFileImpl::GetHash(std::string* hash) {
   return file_.GetHash(hash);
 }
 
 std::string DownloadFileImpl::GetHashState() {
   return file_.GetHashState();
 }
 
@@ skipping 103 matching lines @@
       base::Bind(&DownloadDestinationObserver::DestinationUpdate,
                  observer_, BytesSoFar(), CurrentSpeed(), GetHashState()));
 }
 
 // static
 int DownloadFile::GetNumberOfDownloadFiles() {
   return number_active_objects_;
 }
 
 }  // namespace content