Index: chrome/browser/download/download_browsertest.cc |
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc |
index 6cc0c23dc0ef1ac1dc6f76883847c7f18880046c..8c22b417439b231cb3c8299cba5af45014693b29 100644 |
--- a/chrome/browser/download/download_browsertest.cc |
+++ b/chrome/browser/download/download_browsertest.cc |
@@ -605,9 +605,7 @@ class DownloadTest : public InProcessBrowserTest { |
void DownloadAndWait(Browser* browser, |
const GURL& url) { |
DownloadAndWaitWithDisposition( |
- browser, |
- url, |
- CURRENT_TAB, |
+ browser, url, WindowOpenDisposition::CURRENT_TAB, |
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); |
} |
@@ -733,9 +731,7 @@ class DownloadTest : public InProcessBrowserTest { |
// separate tab. |
GURL finish_url(net::URLRequestSlowDownloadJob::kFinishDownloadUrl); |
ui_test_utils::NavigateToURLWithDisposition( |
- browser, |
- finish_url, |
- NEW_FOREGROUND_TAB, |
+ browser, finish_url, WindowOpenDisposition::NEW_FOREGROUND_TAB, |
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); |
observer->WaitForFinished(); |
EXPECT_EQ(1u, observer->NumDownloadsSeenInState(DownloadItem::COMPLETE)); |
@@ -1450,9 +1446,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadTest_IncognitoRegular) { |
// Download a file in the on-record browser and check that it was downloaded |
// correctly. |
- DownloadAndWaitWithDisposition(browser(), |
- url, |
- CURRENT_TAB, |
+ DownloadAndWaitWithDisposition(browser(), url, |
+ WindowOpenDisposition::CURRENT_TAB, |
ui_test_utils::BROWSER_TEST_NONE); |
GetDownloads(browser(), &download_items); |
ASSERT_EQ(1UL, download_items.size()); |
@@ -1480,9 +1475,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadTest_IncognitoRegular) { |
// Download a file in the incognito browser and check that it was downloaded |
// correctly. |
- DownloadAndWaitWithDisposition(incognito, |
- url, |
- CURRENT_TAB, |
+ DownloadAndWaitWithDisposition(incognito, url, |
+ WindowOpenDisposition::CURRENT_TAB, |
ui_test_utils::BROWSER_TEST_NONE); |
GetDownloads(incognito, &download_items); |
ASSERT_EQ(1UL, download_items.size()); |
@@ -1501,9 +1495,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DontCloseNewTab1) { |
// Open a web page and wait. |
ui_test_utils::NavigateToURLWithDisposition( |
- browser(), |
- url, |
- NEW_BACKGROUND_TAB, |
+ browser(), url, WindowOpenDisposition::NEW_BACKGROUND_TAB, |
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); |
// We should have two tabs now. |
@@ -1517,11 +1509,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, CloseNewTab1) { |
// Download a file in a new background tab and wait. The tab is automatically |
// closed when the download begins. |
GURL url(URLRequestMockHTTPJob::GetMockUrl(kDownloadTest1Path)); |
- DownloadAndWaitWithDisposition( |
- browser(), |
- url, |
- NEW_BACKGROUND_TAB, |
- 0); |
+ DownloadAndWaitWithDisposition(browser(), url, |
+ WindowOpenDisposition::NEW_BACKGROUND_TAB, 0); |
// When the download finishes, we should still have one tab. |
EXPECT_EQ(1, browser()->tab_strip_model()->count()); |
@@ -1546,9 +1535,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DontCloseNewTab2) { |
// Download a file in a new tab and wait (via Javascript). |
base::FilePath file(FILE_PATH_LITERAL("download-test1.lib")); |
- DownloadAndWaitWithDisposition(browser(), |
- GURL("javascript:openNew()"), |
- CURRENT_TAB, |
+ DownloadAndWaitWithDisposition(browser(), GURL("javascript:openNew()"), |
+ WindowOpenDisposition::CURRENT_TAB, |
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB); |
// When the download finishes, we should have two tabs. |
@@ -1573,18 +1561,16 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DontCloseNewTab3) { |
// Open a new tab and wait. |
ui_test_utils::NavigateToURLWithDisposition( |
- browser(), |
- GURL("javascript:openNew()"), |
- CURRENT_TAB, |
+ browser(), GURL("javascript:openNew()"), |
+ WindowOpenDisposition::CURRENT_TAB, |
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB); |
EXPECT_EQ(2, browser()->tab_strip_model()->count()); |
// Download a file and wait. |
GURL url(URLRequestMockHTTPJob::GetMockUrl(kDownloadTest1Path)); |
- DownloadAndWaitWithDisposition(browser(), |
- url, |
- CURRENT_TAB, |
+ DownloadAndWaitWithDisposition(browser(), url, |
+ WindowOpenDisposition::CURRENT_TAB, |
ui_test_utils::BROWSER_TEST_NONE); |
// When the download finishes, we should have two tabs. |
@@ -1611,9 +1597,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, CloseNewTab2) { |
// Download a file and wait. |
// The file to download is "download-test1.lib". |
base::FilePath file(FILE_PATH_LITERAL("download-test1.lib")); |
- DownloadAndWaitWithDisposition(browser(), |
- GURL("javascript:openNew()"), |
- CURRENT_TAB, |
+ DownloadAndWaitWithDisposition(browser(), GURL("javascript:openNew()"), |
+ WindowOpenDisposition::CURRENT_TAB, |
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB); |
// When the download finishes, we should still have one tab. |
@@ -1642,9 +1627,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, CloseNewTab3) { |
// The file to download is "download-test1.lib". |
base::FilePath file(FILE_PATH_LITERAL("download-test1.lib")); |
DownloadAndWaitWithDisposition( |
- browser(), |
- GURL("javascript:document.getElementById('form').submit()"), |
- CURRENT_TAB, |
+ browser(), GURL("javascript:document.getElementById('form').submit()"), |
+ WindowOpenDisposition::CURRENT_TAB, |
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB); |
// When the download finishes, we should still have one tab. |
@@ -2909,9 +2893,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadTest_Remove) { |
ASSERT_TRUE(download_items.empty()); |
// Download a file. |
- DownloadAndWaitWithDisposition(browser(), |
- url, |
- CURRENT_TAB, |
+ DownloadAndWaitWithDisposition(browser(), url, |
+ WindowOpenDisposition::CURRENT_TAB, |
ui_test_utils::BROWSER_TEST_NONE); |
GetDownloads(browser(), &download_items); |
ASSERT_EQ(1UL, download_items.size()); |
@@ -2983,7 +2966,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, MAYBE_DownloadTest_PercentComplete) { |
// Start downloading a file, wait for it to be created. |
ui_test_utils::NavigateToURLWithDisposition( |
- browser(), file_url, CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE); |
+ browser(), file_url, WindowOpenDisposition::CURRENT_TAB, |
+ ui_test_utils::BROWSER_TEST_NONE); |
progress_waiter->WaitForFinished(); |
EXPECT_EQ(1u, progress_waiter->NumDownloadsSeenInState( |
DownloadItem::IN_PROGRESS)); |
@@ -3233,10 +3217,9 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, |
content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_QUIT)); |
std::unique_ptr<content::DownloadTestObserver> in_progress_observer( |
new DisableSafeBrowsingOnInProgressDownload(browser())); |
- ui_test_utils::NavigateToURLWithDisposition(browser(), |
- download_url, |
- NEW_BACKGROUND_TAB, |
- ui_test_utils::BROWSER_TEST_NONE); |
+ ui_test_utils::NavigateToURLWithDisposition( |
+ browser(), download_url, WindowOpenDisposition::NEW_BACKGROUND_TAB, |
+ ui_test_utils::BROWSER_TEST_NONE); |
in_progress_observer->WaitForFinished(); |
// SafeBrowsing should have been disabled by our observer. |
@@ -3267,10 +3250,9 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DangerousFileWithSBDisabledBeforeStart) { |
DangerousDownloadWaiter( |
browser(), 1, |
content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_QUIT)); |
- ui_test_utils::NavigateToURLWithDisposition(browser(), |
- download_url, |
- NEW_BACKGROUND_TAB, |
- ui_test_utils::BROWSER_TEST_NONE); |
+ ui_test_utils::NavigateToURLWithDisposition( |
+ browser(), download_url, WindowOpenDisposition::NEW_BACKGROUND_TAB, |
+ ui_test_utils::BROWSER_TEST_NONE); |
dangerous_observer->WaitForFinished(); |
std::vector<DownloadItem*> downloads; |
@@ -3311,9 +3293,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, FeedbackService) { |
DownloadManagerForBrowser(browser()), 1, |
content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_QUIT)); |
ui_test_utils::NavigateToURLWithDisposition( |
- browser(), |
- GURL(download_url), |
- NEW_BACKGROUND_TAB, |
+ browser(), GURL(download_url), WindowOpenDisposition::NEW_BACKGROUND_TAB, |
ui_test_utils::BROWSER_TEST_NONE); |
observer->WaitForFinished(); |
@@ -3520,7 +3500,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, NewWindow) { |
#endif |
// Download a file in a new window and wait. |
- DownloadAndWaitWithDisposition(browser(), url, NEW_WINDOW, |
+ DownloadAndWaitWithDisposition(browser(), url, |
+ WindowOpenDisposition::NEW_WINDOW, |
ui_test_utils::BROWSER_TEST_NONE); |
// When the download finishes, the download shelf SHOULD NOT be visible in |