Use IPC to wait for download in DownloadTest.

chrome/browser/download/download_uitest.cc

 // Copyright (c) 2006-2008 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 <string>
 
 #include "build/build_config.h"
 #if defined(OS_WIN)
 #include <shlwapi.h>
@@ skipping 94 matching lines @@
       // Complete sending the request.  We do this by loading a second URL in a
       // separate tab.
       scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
       ASSERT_TRUE(window.get());
       EXPECT_TRUE(window->AppendTab(GURL(
           URLRequestSlowDownloadJob::kFinishDownloadUrl)));
       EXPECT_EQ(2, GetTabCount());
       // TODO(tc): check download status text
 
       // Make sure the download shelf is showing.
-      EXPECT_TRUE(WaitForDownloadShelfVisible(window.get()));
+      EXPECT_TRUE(window->WaitForDownloadShelfVisibilityChange(true));
     }
 
     FilePath filename;
     net::FileURLToFilePath(url, &filename);
     filename = filename.BaseName();
     FilePath download_path = download_prefix_.Append(filename);
     EXPECT_TRUE(file_util::PathExists(download_path));
 
     // Delete the file we just downloaded.
     EXPECT_TRUE(file_util::DieFileDie(download_path, true));
@@ skipping 54 matching lines @@
   EXPECT_EQ(1, GetTabCount());
 
   NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(file));
   // No new tabs created, downloads appear in the current tab's download shelf.
   WaitUntilTabCount(1);
 
   CheckDownload(file);
 
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
-  EXPECT_TRUE(WaitForDownloadShelfVisible(browser.get()));
+  EXPECT_TRUE(browser->WaitForDownloadShelfVisibilityChange(true));
 }
 
 // Access a file with a viewable mime-type, verify that a download
 // did not initiate.
 // All download tests are flaky on all platforms, http://crbug.com/35275.
 // Additionally, there is Windows-specific flake, http://crbug.com/20809.
 TEST_F(DownloadTest, FLAKY_NoDownload) {
   FilePath file(FILE_PATH_LITERAL("download-test2.html"));
   FilePath file_path = download_prefix_.Append(file);
 
   if (file_util::PathExists(file_path))
     ASSERT_TRUE(file_util::Delete(file_path, false));
 
   NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(file));
   WaitUntilTabCount(1);
 
   // Wait to see if the file will be downloaded.
   PlatformThread::Sleep(sleep_timeout_ms());
 
   EXPECT_FALSE(file_util::PathExists(file_path));
   if (file_util::PathExists(file_path))
     ASSERT_TRUE(file_util::Delete(file_path, false));
 
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
-  EXPECT_FALSE(WaitForDownloadShelfVisible(browser.get()));
+  EXPECT_FALSE(browser->WaitForDownloadShelfVisibilityChange(true));
 }
 
 // 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.
 // All download tests are flaky on all platforms, http://crbug.com/35275.
 // Additionally, there is Windows-specific flake, http://crbug.com/20809.
 TEST_F(DownloadTest, FLAKY_ContentDisposition) {
   FilePath file(FILE_PATH_LITERAL("download-test3.gif"));
   FilePath download_file(FILE_PATH_LITERAL("download-test3-attachment.gif"));
 
   NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(file));
   WaitUntilTabCount(1);
 
   CheckDownload(download_file, file);
 
   // Ensure the download shelf is visible on the window.
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
-  EXPECT_TRUE(WaitForDownloadShelfVisible(browser.get()));
+  EXPECT_TRUE(browser->WaitForDownloadShelfVisibilityChange(true));
 }
 
 // Test that the download shelf is per-window by starting a download in one
 // tab, opening a second tab, closing the shelf, going back to the first tab,
 // and checking that the shelf is closed.
 // See bug http://crbug.com/26325
 // All download tests are flaky on all platforms, http://crbug.com/35275.
 // Additionally, there is Windows-specific flake, http://crbug.com/20809.
 TEST_F(DownloadTest, FLAKY_PerWindowShelf) {
   FilePath file(FILE_PATH_LITERAL("download-test3.gif"));
   FilePath download_file(FILE_PATH_LITERAL("download-test3-attachment.gif"));
 
   NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(file));
   WaitUntilTabCount(1);
 
   CheckDownload(download_file, file);
 
   // Ensure the download shelf is visible on the window.
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
-  EXPECT_TRUE(WaitForDownloadShelfVisible(browser.get()));
+  EXPECT_TRUE(browser->WaitForDownloadShelfVisibilityChange(true));
 
   // Open a second tab
   ASSERT_TRUE(browser->AppendTab(GURL()));
   WaitUntilTabCount(2);
 
   // Hide shelf
   EXPECT_TRUE(browser->SetShelfVisible(false));
-  EXPECT_TRUE(WaitForDownloadShelfInvisible(browser.get()));
+  EXPECT_TRUE(browser->WaitForDownloadShelfVisibilityChange(false));
 
   // Go to first tab
   EXPECT_TRUE(browser->ActivateTab(0));
   int tab_count;
   EXPECT_TRUE(browser->GetTabCount(&tab_count));
   ASSERT_EQ(2, tab_count);
 
   bool shelf_visible;
   EXPECT_TRUE(browser->IsShelfVisible(&shelf_visible));
   ASSERT_FALSE(shelf_visible);
@@ skipping 53 matching lines @@
   int load_time;
   ASSERT_TRUE(automation()->WaitForInitialNewTabUILoad(&load_time));
 
   // Download something.
   FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
   scoped_refptr<TabProxy> tab(incognito->GetTab(0));
   ASSERT_TRUE(tab.get());
   ASSERT_TRUE(tab->NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(file)));
 
   // Verify that the download shelf is showing for the Incognito window.
-  EXPECT_TRUE(WaitForDownloadShelfVisible(incognito.get()));
+  EXPECT_TRUE(incognito->WaitForDownloadShelfVisibilityChange(true));
 
   // Close the Incognito window and don't crash.
   ASSERT_TRUE(incognito->RunCommand(IDC_CLOSE_WINDOW));
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
   ASSERT_EQ(1, window_count);
 
   // Verify that the regular window does not have a download shelf.
   EXPECT_TRUE(browser->IsShelfVisible(&is_shelf_visible));
   EXPECT_FALSE(is_shelf_visible);
 
@@ skipping 28 matching lines @@
   ASSERT_EQ(1, window_count);
   EXPECT_EQ(1, GetTabCount());
 
   scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
   ASSERT_TRUE(tab_proxy.get());
 
   FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
   ASSERT_TRUE(tab_proxy->NavigateToURLAsyncWithDisposition(
       URLRequestMockHTTPJob::GetMockUrl(file),
       NEW_BACKGROUND_TAB));
+
   // When the download starts, we should still have one tab.
-  ASSERT_TRUE(WaitForDownloadShelfVisible(browser));
+  ASSERT_TRUE(browser->WaitForDownloadShelfVisibilityChange(true));
   EXPECT_EQ(1, GetTabCount());
 
   CheckDownload(file);
 }
 
 // Flaky, see http://crbug.com/43066
 TEST_F(DownloadTest, FLAKY_DontCloseNewTab2) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   int window_count = 0;
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
   ASSERT_EQ(1, window_count);
   EXPECT_EQ(1, GetTabCount());
 
   scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
   ASSERT_TRUE(tab_proxy.get());
 
   ASSERT_TRUE(tab_proxy->NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(
       FilePath(FILE_PATH_LITERAL("download_page1.html")))));
 
   FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
   ASSERT_TRUE(tab_proxy->NavigateToURLAsync(GURL("javascript:openNew()")));
 
-  ASSERT_TRUE(WaitForDownloadShelfVisible(browser));
+  ASSERT_TRUE(browser->WaitForDownloadShelfVisibilityChange(true));
   EXPECT_EQ(2, GetTabCount());
 
   CheckDownload(file);
 }
 
 // Flaky, see http://crbug.com/43066
 TEST_F(DownloadTest, FLAKY_DontCloseNewTab3) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   int window_count = 0;
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
   ASSERT_EQ(1, window_count);
   EXPECT_EQ(1, GetTabCount());
 
   scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
   ASSERT_TRUE(tab_proxy.get());
 
   ASSERT_TRUE(tab_proxy->NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(
       FilePath(FILE_PATH_LITERAL("download_page2.html")))));
 
   ASSERT_TRUE(tab_proxy->NavigateToURLAsync(GURL("javascript:openNew()")));
 
   FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
   ASSERT_TRUE(tab_proxy->NavigateToURLAsync(
       URLRequestMockHTTPJob::GetMockUrl(file)));
 
-  ASSERT_TRUE(WaitForDownloadShelfVisible(browser));
+  ASSERT_TRUE(browser->WaitForDownloadShelfVisibilityChange(true));
   EXPECT_EQ(2, GetTabCount());
 
   CheckDownload(file);
 }
 
 // Flaky, see http://crbug.com/43066
 TEST_F(DownloadTest, FLAKY_CloseNewTab2) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   int window_count = 0;
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
   ASSERT_EQ(1, window_count);
   EXPECT_EQ(1, GetTabCount());
 
   scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
   ASSERT_TRUE(tab_proxy.get());
 
   ASSERT_TRUE(tab_proxy->NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(
       FilePath(FILE_PATH_LITERAL("download_page3.html")))));
 
   FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
   ASSERT_TRUE(tab_proxy->NavigateToURLAsync(GURL("javascript:openNew()")));
 
-  ASSERT_TRUE(WaitForDownloadShelfVisible(browser));
+  ASSERT_TRUE(browser->WaitForDownloadShelfVisibilityChange(true));
   EXPECT_EQ(1, GetTabCount());
 
   CheckDownload(file);
 }
 
 // Flaky, see http://crbug.com/43066
 TEST_F(DownloadTest, FLAKY_CloseNewTab3) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   int window_count = 0;
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
   ASSERT_EQ(1, window_count);
   EXPECT_EQ(1, GetTabCount());
 
   scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
   ASSERT_TRUE(tab_proxy.get());
 
   ASSERT_TRUE(tab_proxy->NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(
       FilePath(FILE_PATH_LITERAL("download_page4.html")))));
 
   FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
   ASSERT_TRUE(tab_proxy->NavigateToURLAsync(
       GURL("javascript:document.getElementById('form').submit()")));
 
-  ASSERT_TRUE(WaitForDownloadShelfVisible(browser));
+  ASSERT_TRUE(browser->WaitForDownloadShelfVisibilityChange(true));
   EXPECT_EQ(1, GetTabCount());
 
   CheckDownload(file);
 }
 
 // Regression test for http://crbug.com/44454
 TEST_F(DownloadTest, NewWindow) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   int window_count = 0;
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
   ASSERT_EQ(1, window_count);
   EXPECT_EQ(1, GetTabCount());
 
   scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
   ASSERT_TRUE(tab_proxy.get());
 
   FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
   ASSERT_TRUE(tab_proxy->NavigateToURLAsyncWithDisposition(
     URLRequestMockHTTPJob::GetMockUrl(file), NEW_WINDOW));
 
   ASSERT_TRUE(automation()->WaitForWindowCountToBecome(1));
 
   CheckDownload(file);
 }
 
 }  // namespace