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

chrome/browser/chromeos/gdata/gdata_download_observer.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 "chrome/browser/chromeos/gdata/gdata_download_observer.h"
 
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "chrome/browser/chromeos/gdata/gdata.pb.h"
 #include "chrome/browser/chromeos/gdata/gdata_documents_service.h"
@@ skipping 340 matching lines @@
       UploadDownloadItem(download);
       break;
 
     case DownloadItem::COMPLETE:
       UploadDownloadItem(download);
       RemovePendingDownload(download);
       break;
 
     // TODO(achuith): Stop the pending upload and delete the file.
     case DownloadItem::CANCELLED:
-    case DownloadItem::REMOVING:
     case DownloadItem::INTERRUPTED:
       RemovePendingDownload(download);
       break;
 
     default:
       NOTREACHED();
   }
   DVLOG(1) << "Number of pending downloads=" << pending_downloads_.size();
 }
 
+void GDataDownloadObserver::OnDownloadDestructed(DownloadItem* download) {
+  RemovePendingDownload(download);
+}
+
 void GDataDownloadObserver::AddPendingDownload(DownloadItem* download) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Add ourself as an observer of this download if we've never seen it before.
   if (pending_downloads_.count(download->GetId()) == 0) {
     pending_downloads_[download->GetId()] = download;
     download->AddObserver(this);
     DVLOG(1) << "new download total bytes=" << download->GetTotalBytes()
              << ", full path=" << download->GetFullPath().value()
              << ", mime type=" << download->GetMimeType();
@@ skipping 98 matching lines @@
     return;
   }
   DVLOG(1) << "Completing upload for download ID " << download_id;
   DownloadItem* download_item = iter->second;
   UploadingExternalData* upload_data = GetUploadingExternalData(download_item);
   DCHECK(upload_data);
   upload_data->CompleteDownload();
 }
 
 }  // namespace gdata