Shift EnsureNoPendingDownloads() implementation into tests.

chrome/browser/download/download_browsertest.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 <sstream>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 795 matching lines @@
     DVLOG(1) << " " << __FUNCTION__ << "()"
              << " folder = '" << destination_folder.value() << "'";
     file_util::PermissionRestorer permission_restorer(destination_folder);
     EXPECT_TRUE(file_util::MakeFileUnwritable(destination_folder));
 
     for (size_t i = 0; i < count; ++i) {
       DownloadFilesCheckErrorsLoopBody(download_info[i], i);
     }
   }
 
-  bool EnsureNoPendingDownloads() {
-    bool result = true;
-    BrowserThread::PostTask(
-        BrowserThread::IO, FROM_HERE,
-        base::Bind(&EnsureNoPendingDownloadJobsOnIO, &result));
-    MessageLoop::current()->Run();
-    return result && DownloadManager::EnsureNoPendingDownloadsForTesting();
-  }
-
   // A mock install prompt that simulates the user allowing an install request.
   void SetAllowMockInstallPrompt() {
     gfx::NativeWindow parent =
         browser()->window() ? browser()->window()->GetNativeWindow() : NULL;
     download_crx_util::SetMockInstallPromptForTesting(
         new MockAutoConfirmExtensionInstallPrompt(parent,
                                                   browser(),
                                                   browser()->profile()));
   }
 
@@ skipping 146 matching lines @@
 // download never makes it to the downloads system.
 IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadResourceThrottleCancels) {
   // Navigate to a page with the same domain as the file to download.  We can't
   // navigate directly to the file we don't want to download because cross-site
   // navigations reset the TabDownloadState.
   FilePath same_site_path(FILE_PATH_LITERAL("download_script.html"));
   GURL same_site_url(URLRequestMockHTTPJob::GetMockUrl(same_site_path));
   ui_test_utils::NavigateToURL(browser(), same_site_url);
 
   // Make sure the initial navigation didn't trigger a download.
-  EXPECT_TRUE(EnsureNoPendingDownloads());
+  std::vector<content::DownloadItem*> items;
+  DownloadManagerForBrowser(browser())->GetAllDownloads(&items);
+  EXPECT_EQ(0u, items.size());
 
   // Disable downloads for the tab.
   WebContents* web_contents = chrome::GetActiveWebContents(browser());
   DownloadRequestLimiter::TabDownloadState* tab_download_state =
       g_browser_process->download_request_limiter()->GetDownloadState(
           web_contents, web_contents, true);
   ASSERT_TRUE(tab_download_state);
   tab_download_state->set_download_status(
       DownloadRequestLimiter::DOWNLOADS_NOT_ALLOWED);
 
@@ skipping 18 matching lines @@
 
   // Check that we did not download the file.
   FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
   FilePath file_path(DestinationFile(browser(), file));
   EXPECT_FALSE(file_util::PathExists(file_path));
 
   // Check state.
   EXPECT_EQ(1, browser()->tab_count());
   EXPECT_FALSE(browser()->window()->IsDownloadShelfVisible());
 
-  // Verify that there's no pending download.
-  EXPECT_TRUE(EnsureNoPendingDownloads());
+  // Verify that there's no pending download.  The resource throttle
+  // should have deleted it before it created a download item, so it
+  // shouldn't be available as a cancelled download either.
+  DownloadManagerForBrowser(browser())->GetAllDownloads(&items);
+  EXPECT_EQ(0u, items.size());
 }
 
 // Download a 0-size file with a content-disposition header, verify that the
 // download tab opened and the file exists as the filename specified in the
 // header.  This also ensures we properly handle empty file downloads.
 // The download shelf should be visible in the current tab.
 IN_PROC_BROWSER_TEST_F(DownloadTest, ContentDisposition) {
   FilePath file(FILE_PATH_LITERAL("download-test3.gif"));
   GURL url(URLRequestMockHTTPJob::GetMockUrl(file));
   FilePath download_file(FILE_PATH_LITERAL("download-test3-attachment.gif"));
@@ skipping 1193 matching lines @@
   GetDownloads(browser(), &download_items);
   ASSERT_EQ(1u, download_items.size());
   ASSERT_EQ(test_server()->GetURL("echoheader?Referer"),
             download_items[0]->GetOriginalUrl());
 
   // Check that the file contains the expected referrer.
   FilePath file(download_items[0]->GetFullPath());
   std::string expected_contents = test_server()->GetURL("").spec();
   ASSERT_TRUE(VerifyFile(file, expected_contents, expected_contents.length()));
 }