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 100 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 99 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;
 
+    first_file_chooser_observer_.reset(
+        new DownloadTestFileChooserObserver(first_profile_));
+    second_file_chooser_observer_.reset(
+        new DownloadTestFileChooserObserver(second_profile_));

[Randy Smith (Not in Mondays), 2012/07/19 18:14:57]

We do downloads in this test on incognito profiles as well; don't you need file
chooser observers for those too?

[asanka, 2012/07/23 19:47:10]

Done.

+
     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 112 matching lines @@
 
     return true;
   }
 
   static const DownloadsCloseCheckCase download_close_check_cases[];
 
   // DownloadCloseCheck variables.
   Profile* first_profile_;
   Profile* second_profile_;
 
+  // FileChooserObservers that suppress file chooser dialogs.
+  scoped_ptr<DownloadTestFileChooserObserver> first_file_chooser_observer_;
+  scoped_ptr<DownloadTestFileChooserObserver> second_file_chooser_observer_;
+
   ScopedTempDir first_profile_downloads_dir_;
   ScopedTempDir second_profile_data_dir_;
   ScopedTempDir second_profile_downloads_dir_;
 };
 
 const BrowserCloseTest::DownloadsCloseCheckCase
 BrowserCloseTest::download_close_check_cases[] = {
   // Top level nesting is {profile_a, profile_b}
   // Second level nesting is {regular, incognito
   // Third level (inner) nesting is {windows, downloads}
@@ skipping 185 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);
   }
 }