Download filename determination refactor (3/3)

chrome/browser/ui/browser_close_browsertest.cc

Index: chrome/browser/ui/browser_close_browsertest.cc
diff --git a/chrome/browser/ui/browser_close_browsertest.cc b/chrome/browser/ui/browser_close_browsertest.cc
index 1eb4ab14112213e1eb8d8d9a5b79ae06a9a1c236..aac75a4b8dbdf81d6c7a84056aa4ea837ca2606f 100644
--- a/chrome/browser/ui/browser_close_browsertest.cc
+++ b/chrome/browser/ui/browser_close_browsertest.cc
@@ -118,8 +118,7 @@ class BrowserCloseTest : public InProcessBrowserTest {
         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;
@@ -239,6 +238,8 @@ class BrowserCloseTest : public InProcessBrowserTest {
     EXPECT_TRUE(second_profile_);
     if (!second_profile_) return false;
 
+    DownloadTestFileChooserObserver(first_profile_) .EnableFileChooser(false);
+    DownloadTestFileChooserObserver(second_profile_).EnableFileChooser(false);
     return true;
   }
 
@@ -276,6 +277,10 @@ class BrowserCloseTest : public InProcessBrowserTest {
     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