Revert 149794 - DownloadItem::Observer::OnDownloadDestroyed() replaces DownloadItem::REMOVING

chrome/browser/ui/cocoa/download/download_item_mac.mm

 // 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 "chrome/browser/ui/cocoa/download/download_item_mac.h"
 
 #include "base/callback.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_item_model.h"
 #import "chrome/browser/ui/cocoa/download/download_item_controller.h"
@@ skipping 28 matching lines @@
     // Turns out the file path is "Unconfirmed %d.crdownload" for dangerous
     // downloads. When the download is confirmed, the file is renamed on
     // another thread, so reload the icon if the download filename changes.
     LoadIcon();
     lastFilePath_ = download->GetUserVerifiedFilePath();
 
     [item_controller_ updateToolTip];
   }
 
   switch (download->GetState()) {
+    case DownloadItem::REMOVING:
+      [item_controller_ remove];  // We're deleted now!
+      break;
     case DownloadItem::COMPLETE:
       if (download->GetAutoOpened()) {
         [item_controller_ remove];  // We're deleted now!
         return;
       }
       download_util::NotifySystemOfDownloadComplete(download->GetFullPath());
       // fall through
     case DownloadItem::IN_PROGRESS:
     case DownloadItem::CANCELLED:
       [item_controller_ setStateFromDownload:download_model_.get()];
       break;
     case DownloadItem::INTERRUPTED:
       [item_controller_ updateToolTip];
       [item_controller_ setStateFromDownload:download_model_.get()];
       break;
     default:
       NOTREACHED();
   }
 }
 
-void DownloadItemMac::OnDownloadDestroyed(content::DownloadItem* download) {
-  [item_controller_ remove];  // We're deleted now!
-}
-
 void DownloadItemMac::OnDownloadOpened(content::DownloadItem* download) {
   DCHECK_EQ(download, download_model_->download());
   [item_controller_ downloadWasOpened];
 }
 
 void DownloadItemMac::LoadIcon() {
   IconManager* icon_manager = g_browser_process->icon_manager();
   if (!icon_manager) {
     NOTREACHED();
     return;
@@ skipping 12 matching lines @@
                          base::Bind(&DownloadItemMac::OnExtractIconComplete,
                                     base::Unretained(this)));
 }
 
 void DownloadItemMac::OnExtractIconComplete(IconManager::Handle handle,
                                             gfx::Image* icon) {
   if (!icon)
     return;
   [item_controller_ setIcon:*icon];
 }