Reland DownloadItem::Observer::OnDownloadDestroyed() replaces DownloadItem::REMOVING

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 280 matching lines @@
     }
   }
 
   // At this point, all dangerous downloads have had their files removed
   // and all in progress downloads have been cancelled.  We can now delete
   // anything left.
 
   // Copy downloads_ to separate container so as not to set off checks
   // in DownloadItem destruction.
   DownloadMap downloads_to_delete;
-  downloads_to_delete.swap(downloads_);
 
   active_downloads_.clear();
   STLDeleteValues(&downloads_to_delete);
+  downloads_to_delete.swap(downloads_);

[Randy Smith (Not in Mondays), 2012/07/11 17:55:37]

Is there a reason for moving this line?  (I don't care, but I don't want to miss
something I should review.)

[benjhayden, 2012/07/13 20:03:17]

~DownloadItemImpl() calls AssertStateConsistent() which checks that the download
is still in |downloads_|.

 
   // We'll have nothing more to report to the observers after this point.
   observers_.Clear();
 
   DCHECK(save_page_downloads_.empty());
 
   file_manager_ = NULL;
   if (delegate_)
     delegate_->Shutdown();
 }
@@ skipping 293 matching lines @@
   // ignore the notification.
   if (active_downloads_.count(download_id) == 0)
     return;
 
   DownloadItem* download = active_downloads_[download_id];
   download->OnAllDataSaved(size, hash);
   MaybeCompleteDownload(download);
 }
 
 void DownloadManagerImpl::AssertStateConsistent(DownloadItem* download) const {
-  if (download->GetState() == DownloadItem::REMOVING) {
-    DCHECK(!ContainsKey(downloads_, download->GetId()));
-    DCHECK(!ContainsKey(active_downloads_, download->GetId()));
-    return;
-  }
-
-  // Should be in downloads_ if we're not REMOVING.
   CHECK(ContainsKey(downloads_, download->GetId()));
 
   int64 state = download->GetState();
   base::debug::Alias(&state);
   if (ContainsKey(active_downloads_, download->GetId())) {
     if (download->IsPersisted())
       CHECK_EQ(DownloadItem::IN_PROGRESS, download->GetState());
     if (DownloadItem::IN_PROGRESS != download->GetState())
       CHECK_EQ(DownloadItem::kUninitializedHandle, download->GetDbHandle());
   }
@@ skipping 156 matching lines @@
 
 bool DownloadManagerImpl::GenerateFileHash() {
   return delegate_ && delegate_->GenerateFileHash();
 }
 
 int DownloadManagerImpl::RemoveDownloadItems(
     const DownloadVector& pending_deletes) {
   if (pending_deletes.empty())
     return 0;
 
+  std::vector<int32> deleting_ids;
+
   // Delete from internal maps.
   for (DownloadVector::const_iterator it = pending_deletes.begin();
       it != pending_deletes.end();
       ++it) {
     DownloadItem* download = *it;
     DCHECK(download);
-    save_page_downloads_.erase(download->GetId());
-    downloads_.erase(download->GetId());
+    deleting_ids.push_back(download->GetId());
   }
 
   // Tell observers to refresh their views.
   NotifyModelChanged();
 
   // Delete the download items themselves.
   const int num_deleted = static_cast<int>(pending_deletes.size());
   STLDeleteContainerPointers(pending_deletes.begin(), pending_deletes.end());
+
+  for (std::vector<int32>::const_iterator it = deleting_ids.begin();
+       it != deleting_ids.end();
+       ++it) {
+    save_page_downloads_.erase(*it);
+    downloads_.erase(*it);
+  }
+

[Randy Smith (Not in Mondays), 2012/07/11 17:55:37]

Why the shift?  This seems more complicated.  Simpler would be to just put a
"delete download" into the loop, above, and just delete everything at once.

[benjhayden, 2012/07/13 20:03:17]

Done.

   return num_deleted;
 }
 
 void DownloadManagerImpl::DownloadRemoved(DownloadItem* download) {
   if (!download ||
       downloads_.find(download->GetId()) == downloads_.end())
     return;
 
   // TODO(benjhayden,rdsmith): Remove this.
   if (!download->IsPersisted())
@@ skipping 358 matching lines @@
 void DownloadManagerImpl::DownloadRenamedToFinalName(
     DownloadItem* download) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // If the rename failed, we receive an OnDownloadInterrupted() call before we
   // receive the DownloadRenamedToFinalName() call.
   if (delegate_) {
     delegate_->UpdatePathForItemInPersistentStore(
         download, download->GetFullPath());
   }
 }