Download filename determination refactor (3/3)

chrome/browser/ui/browser_close_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 "base/command_line.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_service.h"
@@ skipping 101 matching lines @@
 
     if (num_downloads == 0)
       return;
 
     // Setup an observer waiting for the given number of downloads
     // to get to IN_PROGRESS.
     DownloadManager* download_manager =
         BrowserContext::GetDownloadManager(browser->profile());
     scoped_ptr<DownloadTestObserver> observer(
         new DownloadTestObserverInProgress(download_manager,
-                                           num_downloads,
-                                           true));  // Bail on select file.
+                                           num_downloads));
 
     // Set of that number of downloads.
     size_t count_downloads = num_downloads;
     while (num_downloads--)
       ui_test_utils::NavigateToURLWithDisposition(
           browser, url, NEW_BACKGROUND_TAB,
           ui_test_utils::BROWSER_TEST_NONE);
 
     // Wait for them.
     observer->WaitForFinished();
@@ skipping 98 matching lines @@
     EXPECT_TRUE(result);
     if (!result) return false;
     first_profile_->GetPrefs()->SetFilePath(
         prefs::kDownloadDefaultDirectory,
         first_profile_downloads_dir_.path());
 
     second_profile_ = CreateSecondProfile();
     EXPECT_TRUE(second_profile_);
     if (!second_profile_) return false;
 
+    DownloadTestFileChooserObserver(first_profile_) .EnableFileChooser(false);
+    DownloadTestFileChooserObserver(second_profile_).EnableFileChooser(false);
     return true;
   }
 
   // Test a specific DownloadsCloseCheckCase.  Returns false if
   // an assertion has failed and the test should be aborted.
   bool ExecuteDownloadCloseCheckCase(size_t i) {
     const DownloadsCloseCheckCase& check_case(download_close_check_cases[i]);
 
     // Test invariant: so that we don't actually try and close the browser,
     // we always enter the function with a single browser window open on the
@@ skipping 17 matching lines @@
     int total_download_count = DownloadService::DownloadCountAllProfiles();
     EXPECT_EQ(0, total_download_count)
         << "Case " << i
         << ": " << check_case.DebugString();
     if (0 != total_download_count)
       return false;
 
     Profile* first_profile_incognito = first_profile_->GetOffTheRecordProfile();
     Profile* second_profile_incognito =
         second_profile_->GetOffTheRecordProfile();
+    DownloadTestFileChooserObserver(first_profile_incognito)
+        .EnableFileChooser(false);
+    DownloadTestFileChooserObserver(second_profile_incognito)
+        .EnableFileChooser(false);
 
     // For simplicty of coding, we create a window on each profile so that
     // we can easily create downloads, then we destroy or create windows
     // as necessary.
     Browser* browser_a_regular(CreateBrowserOnProfile(first_profile_));
     Browser* browser_a_incognito(
         CreateBrowserOnProfile(first_profile_incognito));
     Browser* browser_b_regular(CreateBrowserOnProfile(second_profile_));
     Browser* browser_b_incognito(
         CreateBrowserOnProfile(second_profile_incognito));
@@ skipping 280 matching lines @@
   }
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserCloseTest, MAYBE_DownloadsCloseCheck_5) {
   ASSERT_TRUE(SetupForDownloadCloseCheck());
   for (size_t i = 5 * arraysize(download_close_check_cases) / 6;
        i < 6 * arraysize(download_close_check_cases) / 6; ++i) {
     ExecuteDownloadCloseCheckCase(i);
   }
 }