[downloads] Remove DownloadManager::RemoveAllDownloads.

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 <utility>
 
 #include "base/bind.h"
@@ skipping 570 matching lines @@
   // Find a better way to create the DownloadResourceHandler instance.
   std::unique_ptr<ResourceHandler> handler(
       DownloadResourceHandler::Create(url_request.get()));
 
   ResourceDispatcherHostImpl::Get()->BeginURLRequest(
       std::move(url_request), std::move(handler), true,  // download
       is_content_initiated, do_not_prompt_for_login, resource_context);
   return DOWNLOAD_INTERRUPT_REASON_NONE;
 }
 
-namespace {
-
-bool EmptyFilter(const GURL& url) {
-  return true;
-}
-
-bool RemoveDownloadByURLAndTime(
+int DownloadManagerImpl::RemoveDownloadsByURLAndTime(
     const base::Callback<bool(const GURL&)>& url_filter,
-          base::Time remove_begin,
-          base::Time remove_end,
-          const DownloadItemImpl* download_item) {
-  return url_filter.Run(download_item->GetURL()) &&
-         download_item->GetStartTime() >= remove_begin &&
-         (remove_end.is_null() || download_item->GetStartTime() < remove_end);
-}
-
-}  // namespace
-
-int DownloadManagerImpl::RemoveDownloads(const DownloadRemover& remover) {
+    base::Time remove_begin,
+    base::Time remove_end) {
   int count = 0;
   auto it = downloads_.begin();
   while (it != downloads_.end()) {
     DownloadItemImpl* download = it->second.get();
 
     // Increment done here to protect against invalidation below.
     ++it;
 
     if (download->GetState() != DownloadItem::IN_PROGRESS &&
-        remover.Run(download)) {
+        url_filter.Run(download->GetURL()) &&
+        download->GetStartTime() >= remove_begin &&
+        (remove_end.is_null() || download->GetStartTime() < remove_end)) {
       download->Remove();
       count++;
     }
   }
   return count;
 }
 
-int DownloadManagerImpl::RemoveDownloadsByURLAndTime(
-    const base::Callback<bool(const GURL&)>& url_filter,
-    base::Time remove_begin,
-    base::Time remove_end) {
-  return RemoveDownloads(base::Bind(&RemoveDownloadByURLAndTime,
-                                    url_filter,
-                                    remove_begin, remove_end));
-}
-
-int DownloadManagerImpl::RemoveAllDownloads() {
-  const base::Callback<bool(const GURL&)> empty_filter =
-      base::Bind(&EmptyFilter);
-  // The null times make the date range unbounded.
-  int num_deleted = RemoveDownloadsByURLAndTime(
-      empty_filter, base::Time(), base::Time());
-  RecordClearAllSize(num_deleted);
-  return num_deleted;
-}
-
 void DownloadManagerImpl::DownloadUrl(
     std::unique_ptr<DownloadUrlParameters> params) {
   if (params->post_id() >= 0) {
     // Check this here so that the traceback is more useful.
     DCHECK(params->prefer_cache());
     DCHECK_EQ("POST", params->method());
   }
   BrowserThread::PostTaskAndReplyWithResult(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&BeginDownload, base::Passed(&params),
@@ skipping 108 matching lines @@
   if (delegate_)
     delegate_->OpenDownload(download);
 }
 
 void DownloadManagerImpl::ShowDownloadInShell(DownloadItemImpl* download) {
   if (delegate_)
     delegate_->ShowDownloadInShell(download);
 }
 
 }  // namespace content