Reland DownloadManager::GetAllDownloads actually does now

chrome/browser/chromeos/gdata/drive_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/drive_download_observer.h"
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/file_util.h"
@@ skipping 333 matching lines @@
     DownloadManager* download_manager) {
   download_manager->RemoveObserver(this);
   download_manager_ = NULL;
 }
 
 void DriveDownloadObserver::ModelChanged(DownloadManager* download_manager) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   DownloadManager::DownloadVector downloads;
   // Drive downloads are considered temporary downloads.
-  download_manager->GetTemporaryDownloads(drive_tmp_download_path_,
-                                          &downloads);
+  download_manager->GetAllDownloads(&downloads);
   for (size_t i = 0; i < downloads.size(); ++i) {
     // Only accept downloads that have the Drive meta data associated with
     // them. Otherwise we might trip over non-Drive downloads being saved to
     // drive_tmp_download_path_.
-    if (IsDriveDownload(downloads[i]))
+    if (downloads[i]->IsTemporary() &&
+        (downloads[i]->GetTargetFilePath().DirName() ==
+         drive_tmp_download_path_) &&
+        IsDriveDownload(downloads[i]))
       OnDownloadUpdated(downloads[i]);
   }
 }
 
 void DriveDownloadObserver::OnDownloadUpdated(DownloadItem* download) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   const DownloadItem::DownloadState state = download->GetState();
   switch (state) {
     case DownloadItem::IN_PROGRESS:
@@ skipping 78 matching lines @@
     return;
   }
 
   drive_uploader_->UpdateUpload(upload_data->upload_id(), download);
 }
 
 bool DriveDownloadObserver::ShouldUpload(DownloadItem* download) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Upload if the item is in pending_downloads_,
+  // has a filename,
   // is complete or large enough to stream, and,
   // is not already being uploaded.
   return (pending_downloads_.count(download->GetId()) != 0) &&
+         !download->GetFullPath().empty() &&
          (download->AllDataSaved() ||
           download->GetReceivedBytes() > kStreamingFileSize) &&
          (GetUploadingUserData(download) == NULL);
 }
 
 void DriveDownloadObserver::CreateUploadFileInfo(DownloadItem* download) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   scoped_ptr<UploadFileInfo> upload_file_info(new UploadFileInfo());
 
@@ skipping 193 matching lines @@
     file_system_->AddUploadedFile(UPLOAD_NEW_FILE,
                                   upload_data->virtual_dir_path(),
                                   entry.Pass(),
                                   download->GetTargetFilePath(),
                                   DriveCache::FILE_OPERATION_MOVE,
                                   base::Bind(&base::DoNothing));
   }
 }
 
 }  // namespace gdata