Make DownloadHistory observe manager, items

content/browser/download/drag_download_file.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/drag_download_file.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "content/browser/download/download_stats.h"
@@ skipping 178 matching lines @@
     if ((*i)->GetOriginalUrl() == url_) {
       download_item_ = *i;
       download_item_->AddObserver(this);
       break;
     }
   }
 }
 
 void DragDownloadFile::OnDownloadUpdated(content::DownloadItem* download) {
   AssertCurrentlyOnUIThread();
-  if (download->IsCancelled() ||
-      (download->GetState() == DownloadItem::REMOVING)) {
+  if (download->IsCancelled()) {
     RemoveObservers();
     DownloadCompleted(false);
   } else if (download->IsComplete()) {
     RemoveObservers();
     DownloadCompleted(true);
   }
   // Ignore other states.
 }
 
+// If the download completes or is cancelled, then OnDownloadUpdated() will
+// handle it and RemoveObserver() so that OnDownloadDestroyed is never called.
+// OnDownloadDestroyed is only called if OnDownloadUpdated() does not detect
+// completion or cancellation (in which cases it removes this observer).
+// TODO(benjhayden): Try to change this to NOTREACHED()?
+void DragDownloadFile::OnDownloadDestroyed(content::DownloadItem* download) {
+  AssertCurrentlyOnUIThread();
+  RemoveObservers();
+  DownloadCompleted(false);
+}
+
 void DragDownloadFile::AssertCurrentlyOnDragThread() {
   // Only do the check on Windows where two threads are involved.
 #if defined(OS_WIN)
   DCHECK(drag_message_loop_ == MessageLoop::current());
 #endif
 }
 
 void DragDownloadFile::AssertCurrentlyOnUIThread() {
   // Only do the check on Windows where two threads are involved.
 #if defined(OS_WIN)
@@ skipping 13 matching lines @@
 
 void DragDownloadFile::QuitNestedMessageLoop() {
   AssertCurrentlyOnDragThread();
 
   if (is_running_nested_message_loop_) {
     is_running_nested_message_loop_ = false;
     MessageLoop::current()->Quit();
   }
 }
 #endif