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

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

Issue 10704052: Download filename determination refactor (3/3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 8 years, 5 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
Index: chrome/browser/download/download_browsertest.cc
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index fcb405bcf44de0b0d59ab2e2ae493eade171ae28..ae2b6e240093b13c8d6bd8962aafb38734bdbda5 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -23,8 +23,6 @@
#include "chrome/browser/download/download_history.h"
#include "chrome/browser/download/download_prefs.h"
#include "chrome/browser/download/download_request_limiter.h"
-#include "chrome/browser/download/download_service.h"
-#include "chrome/browser/download/download_service_factory.h"
#include "chrome/browser/download/download_shelf.h"
#include "chrome/browser/download/download_test_observer.h"
#include "chrome/browser/download/download_util.h"
@@ -86,21 +84,6 @@ const FilePath kGoodCrxPath(FILE_PATH_LITERAL("extensions/good.crx"));
const char kLargeThemeCrxId[] = "pjpgmfcmabopnnfonnhmdjglfpjjfkbf";
const FilePath kLargeThemePath(FILE_PATH_LITERAL("extensions/theme2.crx"));
-class PickSuggestedFileDelegate : public ChromeDownloadManagerDelegate {
- public:
- explicit PickSuggestedFileDelegate(Profile* profile)
- : ChromeDownloadManagerDelegate(profile) {
- }
-
- virtual void ChooseDownloadPath(DownloadItem* item) OVERRIDE {
- if (download_manager_)
- download_manager_->FileSelected(item->GetTargetFilePath(), item->GetId());
- }
-
- protected:
- virtual ~PickSuggestedFileDelegate() {}
-};
-
// Get History Information.
class DownloadsHistoryDataCollector {
public:
@@ -247,12 +230,6 @@ class MockDownloadOpeningObserver : public DownloadManager::Observer {
class DownloadTest : public InProcessBrowserTest {
public:
- enum SelectExpectation {
- EXPECT_NO_SELECT_DIALOG = -1,
- EXPECT_NOTHING,
- EXPECT_SELECT_DIALOG
- };
-
// Choice of navigation or direct fetch. Used by |DownloadFileCheckErrors()|.
enum DownloadMethod {
DOWNLOAD_NAVIGATE,
@@ -311,6 +288,9 @@ class DownloadTest : public InProcessBrowserTest {
DownloadPrefs::FromDownloadManager(manager)->ResetAutoOpen();
manager->RemoveAllDownloads();
+ file_chooser_observer_.reset(
+ new DownloadTestFileChooserObserver(browser()->profile()));
+
return true;
}
@@ -364,7 +344,6 @@ class DownloadTest : public InProcessBrowserTest {
DownloadManager* download_manager = DownloadManagerForBrowser(browser);
return new DownloadTestObserverTerminal(
download_manager, num_downloads,
- true, // Bail on select file
DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL);
}
@@ -374,7 +353,7 @@ class DownloadTest : public InProcessBrowserTest {
int num_downloads) {
DownloadManager* download_manager = DownloadManagerForBrowser(browser);
return new DownloadTestObserverInProgress(
- download_manager, num_downloads, true); // Bail on select file.
+ download_manager, num_downloads);
}
// Create a DownloadTestObserverTerminal that will wait for the
@@ -387,7 +366,6 @@ class DownloadTest : public InProcessBrowserTest {
DownloadManager* download_manager = DownloadManagerForBrowser(browser);
return new DownloadTestObserverTerminal(
download_manager, num_downloads,
- true, // Bail on select file
dangerous_download_action);
}
@@ -411,16 +389,11 @@ class DownloadTest : public InProcessBrowserTest {
// Download |url|, then wait for the download to finish.
// |disposition| indicates where the navigation occurs (current tab, new
// foreground tab, etc).
- // |expectation| indicates whether or not a Select File dialog should be
- // open when the download is finished, or if we don't care.
- // If the dialog appears, the routine exits. The only effect |expectation|
- // has is whether or not the test succeeds.
// |browser_test_flags| indicate what to wait for, and is an OR of 0 or more
// values in the ui_test_utils::BrowserTestWaitFlags enum.
void DownloadAndWaitWithDisposition(Browser* browser,
const GURL& url,
WindowOpenDisposition disposition,
- SelectExpectation expectation,
int browser_test_flags) {
// Setup notification, navigate, and block.
scoped_ptr<DownloadTestObserver> observer(CreateWaiter(browser, 1));
@@ -433,23 +406,17 @@ class DownloadTest : public InProcessBrowserTest {
// Waits for the download to complete.
observer->WaitForFinished();
EXPECT_EQ(1u, observer->NumDownloadsSeenInState(DownloadItem::COMPLETE));
-
- // If specified, check the state of the select file dialog.
- if (expectation != EXPECT_NOTHING) {
- EXPECT_EQ(expectation == EXPECT_SELECT_DIALOG,
- observer->select_file_dialog_seen());
- }
+ // We don't expect a file chooser to be shown.
+ EXPECT_FALSE(DidShowFileChooser());
}
// Download a file in the current tab, then wait for the download to finish.
void DownloadAndWait(Browser* browser,
- const GURL& url,
- SelectExpectation expectation) {
+ const GURL& url) {
DownloadAndWaitWithDisposition(
browser,
url,
CURRENT_TAB,
- expectation,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
}
@@ -582,15 +549,12 @@ class DownloadTest : public InProcessBrowserTest {
EXPECT_EQ(expected, BrowserList::size());
}
- // Arrange for select file calls on the given browser from the
- // download manager to always choose the suggested file.
- void NullSelectFile(Browser* browser) {
- PickSuggestedFileDelegate* new_delegate =
- new PickSuggestedFileDelegate(browser->profile());
+ void EnableFileChooser(bool enable) {
+ file_chooser_observer_->EnableFileChooser(enable);
+ }
- // Gives ownership to DownloadService.
- DownloadServiceFactory::GetForProfile(
- browser->profile())->SetDownloadManagerDelegateForTesting(new_delegate);
+ bool DidShowFileChooser() {
+ return file_chooser_observer_->TestAndResetDidShowFileChooser();
}
// Checks that |path| is has |file_size| bytes, and matches the |value|
@@ -630,7 +594,7 @@ class DownloadTest : public InProcessBrowserTest {
GetDownloads(browser(), &download_items);
ASSERT_TRUE(download_items.empty());
- NullSelectFile(browser());
+ EnableFileChooser(true);
}
void DownloadFilesCheckErrorsLoopBody(const DownloadInfo& download_info,
@@ -663,7 +627,6 @@ class DownloadTest : public InProcessBrowserTest {
new DownloadTestObserverTerminal(
download_manager,
1,
- false, // Don't bail on select file.
DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL));
if (download_info.download_method == DOWNLOAD_DIRECT) {
@@ -867,6 +830,8 @@ class DownloadTest : public InProcessBrowserTest {
// Location of the downloads directory for these tests
ScopedTempDir downloads_directory_;
+
+ scoped_ptr<DownloadTestFileChooserObserver> file_chooser_observer_;
};
// NOTES:
@@ -881,7 +846,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadMimeType) {
GURL url(URLRequestMockHTTPJob::GetMockUrl(file));
// Download the file and wait. We do not expect the Select File dialog.
- DownloadAndWait(browser(), url, EXPECT_NO_SELECT_DIALOG);
+ DownloadAndWait(browser(), url);
// Check state.
EXPECT_EQ(1, browser()->tab_count());
@@ -897,7 +862,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, CheckInternetZone) {
GURL url(URLRequestMockHTTPJob::GetMockUrl(file));
// Download the file and wait. We do not expect the Select File dialog.
- DownloadAndWait(browser(), url, EXPECT_NO_SELECT_DIALOG);
+ DownloadAndWait(browser(), url);
// Check state. Special file state must be checked before CheckDownload,
// as CheckDownload will delete the output file.
@@ -919,7 +884,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadMimeTypeSelect) {
FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
GURL url(URLRequestMockHTTPJob::GetMockUrl(file));
- NullSelectFile(browser());
+ EnableFileChooser(true);
// Download the file and wait. We expect the Select File dialog to appear
// due to the MIME type, but we still wait until the download completes.
@@ -927,7 +892,6 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadMimeTypeSelect) {
new DownloadTestObserverTerminal(
DownloadManagerForBrowser(browser()),
1,
- false, // Continue on select file.
DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL));
ui_test_utils::NavigateToURLWithDisposition(
browser(), url, CURRENT_TAB,
@@ -935,7 +899,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadMimeTypeSelect) {
observer->WaitForFinished();
EXPECT_EQ(1u, observer->NumDownloadsSeenInState(DownloadItem::COMPLETE));
CheckDownloadStates(1, DownloadItem::COMPLETE);
- EXPECT_TRUE(observer->select_file_dialog_seen());
+ EXPECT_TRUE(DidShowFileChooser());
// Check state.
EXPECT_EQ(1, browser()->tab_count());
@@ -1062,7 +1026,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, ContentDisposition) {
FilePath download_file(FILE_PATH_LITERAL("download-test3-attachment.gif"));
// Download a file and wait.
- DownloadAndWait(browser(), url, EXPECT_NO_SELECT_DIALOG);
+ DownloadAndWait(browser(), url);
CheckDownload(browser(), download_file, file);
@@ -1080,7 +1044,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, PerWindowShelf) {
FilePath download_file(FILE_PATH_LITERAL("download-test3-attachment.gif"));
// Download a file and wait.
- DownloadAndWait(browser(), url, EXPECT_NO_SELECT_DIALOG);
+ DownloadAndWait(browser(), url);
CheckDownload(browser(), download_file, file);
@@ -1114,7 +1078,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, CloseShelfOnDownloadsTab) {
GURL url(URLRequestMockHTTPJob::GetMockUrl(file));
// Download the file and wait. We do not expect the Select File dialog.
- DownloadAndWait(browser(), url, EXPECT_NO_SELECT_DIALOG);
+ DownloadAndWait(browser(), url);
// Check state.
EXPECT_EQ(1, browser()->tab_count());
@@ -1162,7 +1126,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, IncognitoDownload) {
// Since |incognito| is a separate browser, we have to set it up explicitly.
incognito->profile()->GetPrefs()->SetBoolean(prefs::kPromptForDownload,
false);
- DownloadAndWait(incognito, url, EXPECT_NO_SELECT_DIALOG);
+ DownloadAndWait(incognito, url);
// We should still have 2 windows.
ExpectWindowCountAfterDownload(2);
@@ -1226,7 +1190,6 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, CloseNewTab1) {
browser(),
url,
NEW_BACKGROUND_TAB,
- EXPECT_NO_SELECT_DIALOG,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// When the download finishes, we should still have one tab.
@@ -1257,7 +1220,6 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DontCloseNewTab2) {
DownloadAndWaitWithDisposition(browser(),
GURL("javascript:openNew()"),
CURRENT_TAB,
- EXPECT_NO_SELECT_DIALOG,
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
// When the download finishes, we should have two tabs.
@@ -1298,7 +1260,6 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DontCloseNewTab3) {
DownloadAndWaitWithDisposition(browser(),
url,
CURRENT_TAB,
- EXPECT_NO_SELECT_DIALOG,
ui_test_utils::BROWSER_TEST_NONE);
// When the download finishes, we should have two tabs.
@@ -1330,7 +1291,6 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, CloseNewTab2) {
DownloadAndWaitWithDisposition(browser(),
GURL("javascript:openNew()"),
CURRENT_TAB,
- EXPECT_NO_SELECT_DIALOG,
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
// When the download finishes, we should still have one tab.
@@ -1364,7 +1324,6 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, CloseNewTab3) {
browser(),
GURL("javascript:document.getElementById('form').submit()"),
CURRENT_TAB,
- EXPECT_NO_SELECT_DIALOG,
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
// When the download finishes, we should still have one tab.
@@ -1393,7 +1352,6 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, NewWindow) {
DownloadAndWaitWithDisposition(browser(),
url,
NEW_WINDOW,
- EXPECT_NO_SELECT_DIALOG,
ui_test_utils::BROWSER_TEST_NONE);
// When the download finishes, the download shelf SHOULD NOT be visible in
@@ -1463,7 +1421,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, MultiDownload) {
FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
GURL url(URLRequestMockHTTPJob::GetMockUrl(file));
// Download the file and wait. We do not expect the Select File dialog.
- DownloadAndWait(browser(), url, EXPECT_NO_SELECT_DIALOG);
+ DownloadAndWait(browser(), url);
// Should now have 2 items on the download shelf.
downloads.clear();
@@ -1568,7 +1526,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadHistoryCheck) {
file_util::GetFileSize(origin_file, &origin_size);
// Download the file and wait. We do not expect the Select File dialog.
- DownloadAndWait(browser(), url, EXPECT_NO_SELECT_DIALOG);
+ DownloadAndWait(browser(), url);
// Get details of what downloads have just happened.
std::vector<DownloadItem*> downloads;
@@ -1604,7 +1562,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, ChromeURLAfterDownload) {
GURL extensions_url(chrome::kChromeUIExtensionsFrameURL);
ui_test_utils::NavigateToURL(browser(), flags_url);
- DownloadAndWait(browser(), download_url, EXPECT_NO_SELECT_DIALOG);
+ DownloadAndWait(browser(), download_url);
ui_test_utils::NavigateToURL(browser(), extensions_url);
WebContents* contents = chrome::GetActiveWebContents(browser());
ASSERT_TRUE(contents);
@@ -1637,7 +1595,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, BrowserCloseAfterDownload) {
&result));
EXPECT_TRUE(result);
- DownloadAndWait(browser(), download_url, EXPECT_NO_SELECT_DIALOG);
+ DownloadAndWait(browser(), download_url);
ui_test_utils::WindowedNotificationObserver signal(
chrome::NOTIFICATION_BROWSER_CLOSED,
@@ -1679,7 +1637,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, AutoOpen) {
MockDownloadOpeningObserver observer(
DownloadManagerForBrowser(browser()));
- DownloadAndWait(browser(), url, EXPECT_NO_SELECT_DIALOG);
+ DownloadAndWait(browser(), url);
// Find the download and confirm it was opened.
std::vector<DownloadItem*> downloads;
@@ -1981,7 +1939,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadUrl) {
GURL url(URLRequestMockHTTPJob::GetMockUrl(file));
// DownloadUrl always prompts; return acceptance of whatever it prompts.
- NullSelectFile(browser());
+ EnableFileChooser(true);
WebContents* web_contents = chrome::GetActiveWebContents(browser());
ASSERT_TRUE(web_contents);
@@ -1989,7 +1947,6 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadUrl) {
DownloadTestObserver* observer(
new DownloadTestObserverTerminal(
DownloadManagerForBrowser(browser()), 1,
- false, // Ignore select file.
DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL));
content::DownloadSaveInfo save_info;
save_info.prompt_for_save_location = true;
@@ -1999,7 +1956,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadUrl) {
observer->WaitForFinished();
EXPECT_EQ(1u, observer->NumDownloadsSeenInState(DownloadItem::COMPLETE));
CheckDownloadStates(1, DownloadItem::COMPLETE);
- EXPECT_TRUE(observer->select_file_dialog_seen());
+ EXPECT_TRUE(DidShowFileChooser());
// Check state.
EXPECT_EQ(1, browser()->tab_count());
@@ -2041,7 +1998,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadUrlToPath) {
IN_PROC_BROWSER_TEST_F(DownloadTest, SavePageNonHTMLViaGet) {
// Do initial setup.
ASSERT_TRUE(test_server()->Start());
- NullSelectFile(browser());
+ EnableFileChooser(true);
std::vector<DownloadItem*> download_items;
GetDownloads(browser(), &download_items);
ASSERT_TRUE(download_items.empty());
@@ -2060,7 +2017,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, SavePageNonHTMLViaGet) {
scoped_ptr<DownloadTestObserver> waiter(
new DownloadTestObserverTerminal(
DownloadManagerForBrowser(browser()), 1,
- false, DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL));
+ DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL));
chrome::SavePage(browser());
waiter->WaitForFinished();
EXPECT_EQ(1u, waiter->NumDownloadsSeenInState(DownloadItem::COMPLETE));
@@ -2068,7 +2025,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, SavePageNonHTMLViaGet) {
// Validate that the correct file was downloaded.
GetDownloads(browser(), &download_items);
- EXPECT_TRUE(waiter->select_file_dialog_seen());
+ EXPECT_TRUE(DidShowFileChooser());
ASSERT_EQ(1u, download_items.size());
ASSERT_EQ(url, download_items[0]->GetOriginalUrl());
@@ -2076,7 +2033,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, SavePageNonHTMLViaGet) {
scoped_ptr<DownloadTestObserver> waiter_context_menu(
new DownloadTestObserverTerminal(
DownloadManagerForBrowser(browser()), 1,
- false, DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL));
+ DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL));
content::ContextMenuParams context_menu_params;
context_menu_params.media_type = WebKit::WebContextMenuData::MediaTypeImage;
context_menu_params.src_url = url;
@@ -2093,7 +2050,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, SavePageNonHTMLViaGet) {
// Validate that the correct file was downloaded via the context menu.
download_items.clear();
GetDownloads(browser(), &download_items);
- EXPECT_TRUE(waiter_context_menu->select_file_dialog_seen());
+ EXPECT_TRUE(DidShowFileChooser());
ASSERT_EQ(2u, download_items.size());
ASSERT_EQ(url, download_items[0]->GetOriginalUrl());
ASSERT_EQ(url, download_items[1]->GetOriginalUrl());
@@ -2102,7 +2059,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, SavePageNonHTMLViaGet) {
IN_PROC_BROWSER_TEST_F(DownloadTest, SavePageNonHTMLViaPost) {
// Do initial setup.
ASSERT_TRUE(test_server()->Start());
- NullSelectFile(browser());
+ EnableFileChooser(true);
std::vector<DownloadItem*> download_items;
GetDownloads(browser(), &download_items);
ASSERT_TRUE(download_items.empty());
@@ -2139,7 +2096,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, SavePageNonHTMLViaPost) {
scoped_ptr<DownloadTestObserver> waiter(
new DownloadTestObserverTerminal(
DownloadManagerForBrowser(browser()), 1,
- false, DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL));
+ DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL));
chrome::SavePage(browser());
waiter->WaitForFinished();
EXPECT_EQ(1u, waiter->NumDownloadsSeenInState(DownloadItem::COMPLETE));
@@ -2147,7 +2104,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, SavePageNonHTMLViaPost) {
// Validate that the correct file was downloaded.
GetDownloads(browser(), &download_items);
- EXPECT_TRUE(waiter->select_file_dialog_seen());
+ EXPECT_TRUE(DidShowFileChooser());
ASSERT_EQ(1u, download_items.size());
ASSERT_EQ(jpeg_url, download_items[0]->GetOriginalUrl());
@@ -2155,7 +2112,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, SavePageNonHTMLViaPost) {
scoped_ptr<DownloadTestObserver> waiter_context_menu(
new DownloadTestObserverTerminal(
DownloadManagerForBrowser(browser()), 1,
- false, DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL));
+ DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL));
content::ContextMenuParams context_menu_params;
context_menu_params.media_type = WebKit::WebContextMenuData::MediaTypeImage;
context_menu_params.src_url = jpeg_url;
@@ -2171,7 +2128,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, SavePageNonHTMLViaPost) {
// Validate that the correct file was downloaded via the context menu.
download_items.clear();
GetDownloads(browser(), &download_items);
- EXPECT_TRUE(waiter_context_menu->select_file_dialog_seen());
+ EXPECT_TRUE(DidShowFileChooser());
ASSERT_EQ(2u, download_items.size());
ASSERT_EQ(jpeg_url, download_items[0]->GetOriginalUrl());
ASSERT_EQ(jpeg_url, download_items[1]->GetOriginalUrl());
@@ -2460,7 +2417,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadDangerousBlobData) {
IN_PROC_BROWSER_TEST_F(DownloadTest, LoadURLExternallyReferrerPolicy) {
// Do initial setup.
ASSERT_TRUE(test_server()->Start());
- NullSelectFile(browser());
+ EnableFileChooser(true);
std::vector<DownloadItem*> download_items;
GetDownloads(browser(), &download_items);
ASSERT_TRUE(download_items.empty());
@@ -2474,7 +2431,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, LoadURLExternallyReferrerPolicy) {
scoped_ptr<DownloadTestObserver> waiter(
new DownloadTestObserverTerminal(
DownloadManagerForBrowser(browser()), 1,
- false, DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL));
+ DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL));
// Click on the link with the alt key pressed. This will download the link
// target.

Powered by Google App Engine
This is Rietveld 408576698