Revert 121031 - Eliminate DownloadProgressUpdated.

content/browser/download/download_manager_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_manager_impl.h"
 
 #include <iterator>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 432 matching lines @@
   DCHECK(ContainsKey(active_downloads_, download_id));
 
   // Make sure the initial file name is set only once.
   DCHECK(download->GetFullPath().empty());
   download->OnPathDetermined(chosen_file);
 
   VLOG(20) << __FUNCTION__ << "()"
            << " download = " << download->DebugString(true);
 
   in_progress_[download_id] = download;
+  UpdateDownloadProgress();  // Reflect entry into in_progress_.
 
   // Rename to intermediate name.
   FilePath download_path;
   if (download->GetDangerType() !=
           content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS) {
     if (download->PromptUserForSaveLocation()) {
       // When we prompt the user, we overwrite the FullPath with what the user
       // wanted to use. Construct a file path using the previously determined
       // intermediate filename and the new path.
       // TODO(asanka): This can trample an in-progress download in the new
@@ skipping 26 matching lines @@
 void DownloadManagerImpl::UpdateDownload(int32 download_id,
                                          int64 bytes_so_far,
                                          int64 bytes_per_sec,
                                          const std::string& hash_state) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DownloadMap::iterator it = active_downloads_.find(download_id);
   if (it != active_downloads_.end()) {
     DownloadItem* download = it->second;
     if (download->IsInProgress()) {
       download->UpdateProgress(bytes_so_far, bytes_per_sec, hash_state);
+      UpdateDownloadProgress();  // Reflect size updates.
       delegate_->UpdateItemInPersistentStore(download);
     }
   }
 }
 
 void DownloadManagerImpl::OnResponseCompleted(int32 download_id,
                                               int64 size,
                                               const std::string& hash) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   VLOG(20) << __FUNCTION__ << "()" << " download_id = " << download_id
@@ skipping 93 matching lines @@
 
   // Give the delegate a chance to override.
   if (!delegate_->ShouldCompleteDownload(download))
     return;
 
   VLOG(20) << __FUNCTION__ << "()" << " executing: download = "
            << download->DebugString(false);
 
   // Remove the id from in_progress
   in_progress_.erase(download->GetId());
+  UpdateDownloadProgress();  // Reflect removal from in_progress_.
 
   delegate_->UpdateItemInPersistentStore(download);
 
   // Finish the download.
   download->OnDownloadCompleting(file_manager_);
 }
 
 void DownloadManagerImpl::DownloadCompleted(DownloadItem* download) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(download);
@@ skipping 96 matching lines @@
 
 void DownloadManagerImpl::RemoveFromActiveList(DownloadItem* download) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(download);
 
   // Clean up will happen when the history system create callback runs if we
   // don't have a valid db_handle yet.
   if (download->GetDbHandle() != DownloadItem::kUninitializedHandle) {
     in_progress_.erase(download->GetId());
     active_downloads_.erase(download->GetId());
+    UpdateDownloadProgress();  // Reflect removal from in_progress_.
     delegate_->UpdateItemInPersistentStore(download);
   }
 }
 
 bool DownloadManagerImpl::GenerateFileHash() {
   return delegate_->GenerateFileHash();
 }
 
 content::DownloadManagerDelegate* DownloadManagerImpl::delegate() const {
   return delegate_;
 }
 
 void DownloadManagerImpl::SetDownloadManagerDelegate(
     content::DownloadManagerDelegate* delegate) {
   delegate_ = delegate;
 }
 
+void DownloadManagerImpl::UpdateDownloadProgress() {
+  delegate_->DownloadProgressUpdated();
+}
+
 int DownloadManagerImpl::RemoveDownloadItems(
     const DownloadVector& pending_deletes) {
   if (pending_deletes.empty())
     return 0;
 
   // Delete from internal maps.
   for (DownloadVector::const_iterator it = pending_deletes.begin();
       it != pending_deletes.end();
       ++it) {
     DownloadItem* download = *it;
@@ skipping 403 matching lines @@
        it != history_downloads_.end(); ++it) {
     if (it->second->IsComplete() && !it->second->GetOpened())
       ++num_unopened;
   }
   download_stats::RecordOpensOutstanding(num_unopened);
 }
 
 void DownloadManagerImpl::SetFileManager(DownloadFileManager* file_manager) {
   file_manager_ = file_manager;
 }