Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(781)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/download/download_browsertest.cc

Issue 9568003: Fixed issue with DownloadTestObserver. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Split DownloadTestObserver in two Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/download/download_extension_test.cc » ('j') | chrome/browser/download/download_test_observer.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/download/download_browsertest.cc
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index d3e0f19b564e8f9199c44fae8e5114aab17c18bb..838e977d77df65a687b1ec3db24f040d92a2ad8a 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -395,7 +395,6 @@ class DownloadTest : public InProcessBrowserTest {
DownloadManager* download_manager = DownloadManagerForBrowser(browser);
return new DownloadTestObserver(
download_manager, num_downloads,
- DownloadItem::COMPLETE, // Really done
true, // Bail on select file
DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL);
}
@@ -405,11 +404,8 @@ class DownloadTest : public InProcessBrowserTest {
DownloadTestObserver* CreateInProgressWaiter(Browser* browser,
int num_downloads) {
DownloadManager* download_manager = DownloadManagerForBrowser(browser);
- return new DownloadTestObserver(
- download_manager, num_downloads,
- DownloadItem::IN_PROGRESS, // Has started
- true, // Bail on select file
- DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL);
+ return new DownloadTestObserverInProgress(
+ download_manager, num_downloads);
}
// Create a DownloadTestObserver that will wait for the
@@ -418,12 +414,10 @@ class DownloadTest : public InProcessBrowserTest {
DownloadTestObserver* DangerousInstallWaiter(
Browser* browser,
int num_downloads,
- DownloadItem::DownloadState final_state,
DownloadTestObserver::DangerousDownloadAction dangerous_download_action) {
DownloadManager* download_manager = DownloadManagerForBrowser(browser);
return new DownloadTestObserver(
download_manager, num_downloads,
- final_state,
true, // Bail on select file
dangerous_download_action);
}
@@ -697,9 +691,6 @@ class DownloadTest : public InProcessBrowserTest {
new DownloadTestObserver(
download_manager,
1,
- download_info.reason == DOWNLOAD_INTERRUPT_REASON_NONE ?
- DownloadItem::COMPLETE : // Really done
- DownloadItem::INTERRUPTED,
true, // Bail on select file
DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL));
@@ -802,7 +793,6 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadMimeTypeSelect) {
new DownloadTestObserver(
DownloadManagerForBrowser(browser()),
1,
- DownloadItem::COMPLETE, // Really done
false, // Continue on select file.
DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL));
ui_test_utils::NavigateToURLWithDisposition(
@@ -1552,7 +1542,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, CrxDenyInstall) {
scoped_ptr<DownloadTestObserver> observer(
DangerousInstallWaiter(
- browser(), 1, DownloadItem::CANCELLED,
+ browser(), 1,
DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_DENY));
ui_test_utils::NavigateToURL(browser(), extension_url);
@@ -1581,7 +1571,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, CrxInstallDenysPermissions) {
scoped_ptr<DownloadTestObserver> observer(
DangerousInstallWaiter(
- browser(), 1, DownloadItem::COMPLETE,
+ browser(), 1,
DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_ACCEPT));
ui_test_utils::NavigateToURL(browser(), extension_url);
@@ -1610,7 +1600,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, CrxInstallAcceptPermissions) {
scoped_ptr<DownloadTestObserver> observer(
DangerousInstallWaiter(
- browser(), 1, DownloadItem::COMPLETE,
+ browser(), 1,
DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_ACCEPT));
ui_test_utils::NavigateToURL(browser(), extension_url);
@@ -1640,7 +1630,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, CrxInvalid) {
scoped_ptr<DownloadTestObserver> observer(
DangerousInstallWaiter(
- browser(), 1, DownloadItem::COMPLETE,
+ browser(), 1,
DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_ACCEPT));
ui_test_utils::NavigateToURL(browser(), extension_url);
@@ -1664,7 +1654,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, CrxLargeTheme) {
scoped_ptr<DownloadTestObserver> observer(
DangerousInstallWaiter(
- browser(), 1, DownloadItem::COMPLETE,
+ browser(), 1,
DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_ACCEPT));
ui_test_utils::NavigateToURL(browser(), extension_url);
@@ -1827,7 +1817,6 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadUrl) {
DownloadTestObserver* observer(
new DownloadTestObserver(
DownloadManagerForBrowser(browser()), 1,
- DownloadItem::COMPLETE, // Really done
false, // Ignore select file.
DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL));
DownloadSaveInfo save_info;
@@ -1895,7 +1884,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, SavePageNonHTMLViaGet) {
ASSERT_TRUE(test_server()->Stop());
scoped_ptr<DownloadTestObserver> waiter(
new DownloadTestObserver(
- DownloadManagerForBrowser(browser()), 1, DownloadItem::COMPLETE,
+ DownloadManagerForBrowser(browser()), 1,
false, DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL));
browser()->SavePage();
waiter->WaitForFinished();
@@ -1905,11 +1894,12 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, SavePageNonHTMLViaGet) {
EXPECT_TRUE(waiter->select_file_dialog_seen());
ASSERT_EQ(1u, download_items.size());
ASSERT_EQ(url, download_items[0]->GetOriginalUrl());
+ EXPECT_EQ(DownloadItem::COMPLETE, download_items[0]->GetState());
// Try to download it via a context menu.
scoped_ptr<DownloadTestObserver> waiter_context_menu(
new DownloadTestObserver(
- DownloadManagerForBrowser(browser()), 1, DownloadItem::COMPLETE,
+ DownloadManagerForBrowser(browser()), 1,
false, DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL));
content::ContextMenuParams context_menu_params;
context_menu_params.media_type = WebKit::WebContextMenuData::MediaTypeImage;
@@ -1925,9 +1915,11 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, SavePageNonHTMLViaGet) {
download_items.clear();
GetDownloads(browser(), &download_items);
EXPECT_TRUE(waiter_context_menu->select_file_dialog_seen());
+ EXPECT_EQ(DownloadItem::COMPLETE, download_items[0]->GetState());
ASSERT_EQ(2u, download_items.size());
ASSERT_EQ(url, download_items[0]->GetOriginalUrl());
ASSERT_EQ(url, download_items[1]->GetOriginalUrl());
+ EXPECT_EQ(DownloadItem::COMPLETE, download_items[1]->GetState());
}
IN_PROC_BROWSER_TEST_F(DownloadTest, SavePageNonHTMLViaPost) {
@@ -1970,7 +1962,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, SavePageNonHTMLViaPost) {
ASSERT_TRUE(test_server()->Stop());
scoped_ptr<DownloadTestObserver> waiter(
new DownloadTestObserver(
- DownloadManagerForBrowser(browser()), 1, DownloadItem::COMPLETE,
+ DownloadManagerForBrowser(browser()), 1,
false, DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL));
browser()->SavePage();
waiter->WaitForFinished();
@@ -1984,7 +1976,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, SavePageNonHTMLViaPost) {
// Try to download it via a context menu.
scoped_ptr<DownloadTestObserver> waiter_context_menu(
new DownloadTestObserver(
- DownloadManagerForBrowser(browser()), 1, DownloadItem::COMPLETE,
+ DownloadManagerForBrowser(browser()), 1,
false, DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL));
content::ContextMenuParams context_menu_params;
context_menu_params.media_type = WebKit::WebContextMenuData::MediaTypeImage;
« no previous file with comments | « no previous file | chrome/browser/download/download_extension_test.cc » ('j') | chrome/browser/download/download_test_observer.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698