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..76b62df3d61ca22c5a7be61a579e2099579998f7 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,11 @@ class BrowserCloseTest : public InProcessBrowserTest {
     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;
   }
 
@@ -371,6 +375,10 @@ class BrowserCloseTest : public InProcessBrowserTest {
   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_;