Added clearing of downloads_ set on RemoveDownloadsBetween pathway.

chrome/browser/download/download_manager.cc

 // Copyright (c) 2010 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 "chrome/browser/download/download_manager.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/callback.h"
 #include "base/file_util.h"
@@ skipping 701 matching lines @@
   // Tell observers to refresh their views.
   NotifyModelChanged();
 
   delete download;
 }
 
 int DownloadManager::RemoveDownloadsBetween(const base::Time remove_begin,
                                             const base::Time remove_end) {
   download_history_->RemoveEntriesBetween(remove_begin, remove_end);
 
+  // All downloads visible to the user will be in the history,
+  // so scan that map.
   DownloadMap::iterator it = history_downloads_.begin();
   std::vector<DownloadItem*> pending_deletes;
   while (it != history_downloads_.end()) {
     DownloadItem* download = it->second;
     DownloadItem::DownloadState state = download->state();
     if (download->start_time() >= remove_begin &&
         (remove_end.is_null() || download->start_time() < remove_end) &&
         (state == DownloadItem::COMPLETE ||
          state == DownloadItem::CANCELLED)) {
       // Remove from the map and move to the next in the list.
       history_downloads_.erase(it++);
 
       // Also remove it from any completed dangerous downloads.
       pending_deletes.push_back(download);
 
       continue;
     }
 
     ++it;
   }
 

[cbentzel, 2010/12/15 21:34:20]

Would this be clearer if you did

if (pending_deletes.empty())
  return 0;

int num_deleted = static_cast<int>

+  // If we aren't deleting anything, we're done.
+  int num_deleted = static_cast<int>(pending_deletes.size());
+  if (num_deleted == 0)
+    return num_deleted;
+
+  // Remove the chosen downloads from the main owning container.
+  for (std::vector<DownloadItem*>::iterator it = pending_deletes.begin();
+       it != pending_deletes.end(); it++) {
+    downloads_.erase(*it);
+  }
+
   // Tell observers to refresh their views.
-  int num_deleted = static_cast<int>(pending_deletes.size());
-  if (num_deleted > 0)
-    NotifyModelChanged();
+  NotifyModelChanged();
 
-  // Delete the download items after updating the observers.
+  // Delete the download items themselves.
   STLDeleteContainerPointers(pending_deletes.begin(), pending_deletes.end());
   pending_deletes.clear();
 
   return num_deleted;
 }
 
 int DownloadManager::RemoveDownloads(const base::Time remove_begin) {
   return RemoveDownloadsBetween(remove_begin, base::Time());
 }
 
@@ skipping 274 matching lines @@
     observed_download_manager_->RemoveObserver(this);
 }
 
 void DownloadManager::OtherDownloadManagerObserver::ModelChanged() {
   observing_download_manager_->NotifyModelChanged();
 }
 
 void DownloadManager::OtherDownloadManagerObserver::ManagerGoingDown() {
   observed_download_manager_ = NULL;
 }