Revert 155351 - Make DownloadManager::GetAllDownloads return all downloads regardless of state, per…

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 331 matching lines @@
     DownloadItemImpl* item = it->second;
     // TODO(benjhayden): Don't check IsPersisted().
     if (item->IsTemporary() &&
         item->IsPersisted() &&
         (dir_path.empty() ||
          item->GetTargetFilePath().DirName() == dir_path))
       result->push_back(item);
   }
 }
 
+void DownloadManagerImpl::GetAllDownloads(
+    const FilePath& dir_path, DownloadVector* result) {
+  DCHECK(result);
+
+  for (DownloadMap::iterator it = downloads_.begin();
+       it != downloads_.end(); ++it) {
+    DownloadItemImpl* item = it->second;
+    // TODO(benjhayden): Don't check IsPersisted().
+    if (!item->IsTemporary() &&
+        item->IsPersisted() &&
+        (dir_path.empty() ||
+         item->GetTargetFilePath().DirName() == dir_path))
+      result->push_back(item);
+  }
+}
+
 void DownloadManagerImpl::SearchDownloads(const string16& query,
                                           DownloadVector* result) {
   string16 query_lower(base::i18n::ToLower(query));
 
   for (DownloadMap::iterator it = downloads_.begin();
        it != downloads_.end(); ++it) {
     DownloadItemImpl* download_item = it->second;
     // TODO(benjhayden): Don't check IsPersisted().
     if (!download_item->IsTemporary() &&
         download_item->IsPersisted() &&
@@ skipping 597 matching lines @@
 
 DownloadItem* DownloadManagerImpl::GetDownloadItem(int download_id) {
   DownloadItem* download = GetDownload(download_id);
   return (download && download->IsPersisted()) ? download : NULL;
 }
 
 DownloadItem* DownloadManagerImpl::GetDownload(int download_id) {
   return ContainsKey(downloads_, download_id) ? downloads_[download_id] : NULL;
 }
 
-void DownloadManagerImpl::GetAllDownloads(DownloadVector* downloads) {
-  for (DownloadMap::iterator it = downloads_.begin();
-       it != downloads_.end(); ++it) {
-    downloads->push_back(it->second);
-  }
-}
-
 DownloadItem* DownloadManagerImpl::GetActiveDownloadItem(int download_id) {
   if (ContainsKey(active_downloads_, download_id))
     return active_downloads_[download_id];
   return NULL;
 }
 
 // Confirm that everything in all maps is also in |downloads_|, and that
 // everything in |downloads_| is also in some other map.
 void DownloadManagerImpl::AssertContainersConsistent() const {
 #if !defined(NDEBUG)
@@ skipping 95 matching lines @@
 void DownloadManagerImpl::DownloadRenamedToFinalName(
     DownloadItemImpl* 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());
   }
 }