| Index: chrome/browser/download/download_browsertest.cc
|
| diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
|
| index bad5771c7e62407b22c580b0e946c7df310034b0..9d3c6ea68acad4c527b7dc3120d6aabfdaed5af8 100644
|
| --- a/chrome/browser/download/download_browsertest.cc
|
| +++ b/chrome/browser/download/download_browsertest.cc
|
| @@ -882,7 +882,8 @@ class DownloadTest : public InProcessBrowserTest {
|
| creation_observer(new content::DownloadTestItemCreationObserver);
|
|
|
| std::unique_ptr<DownloadUrlParameters> params(
|
| - DownloadUrlParameters::FromWebContents(web_contents, starting_url));
|
| + DownloadUrlParameters::CreateForWebContentsMainFrame(
|
| + web_contents, starting_url));
|
| params->set_callback(creation_observer->callback());
|
| DownloadManagerForBrowser(browser())->DownloadUrl(std::move(params));
|
|
|
| @@ -1688,7 +1689,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, CloseNewTab4) {
|
|
|
| // Download a file in that new tab, having it open a file picker
|
| std::unique_ptr<DownloadUrlParameters> params(
|
| - DownloadUrlParameters::FromWebContents(new_tab, slow_download_url));
|
| + DownloadUrlParameters::CreateForWebContentsMainFrame(
|
| + new_tab, slow_download_url));
|
| params->set_prompt(true);
|
| manager->DownloadUrl(std::move(params));
|
| observer->WaitForFinished();
|
| @@ -2155,7 +2157,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadUrl) {
|
| DownloadManagerForBrowser(browser()), 1,
|
| content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL));
|
| std::unique_ptr<DownloadUrlParameters> params(
|
| - DownloadUrlParameters::FromWebContents(web_contents, url));
|
| + DownloadUrlParameters::CreateForWebContentsMainFrame(
|
| + web_contents, url));
|
| params->set_prompt(true);
|
| DownloadManagerForBrowser(browser())->DownloadUrl(std::move(params));
|
| observer->WaitForFinished();
|
| @@ -2183,7 +2186,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadUrlToPath) {
|
| = other_directory.path().Append(file.BaseName());
|
| content::DownloadTestObserver* observer(CreateWaiter(browser(), 1));
|
| std::unique_ptr<DownloadUrlParameters> params(
|
| - DownloadUrlParameters::FromWebContents(web_contents, url));
|
| + DownloadUrlParameters::CreateForWebContentsMainFrame(
|
| + web_contents, url));
|
| params->set_file_path(target_file_full_path);
|
| DownloadManagerForBrowser(browser())->DownloadUrl(std::move(params));
|
| observer->WaitForFinished();
|
| @@ -3638,7 +3642,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTestWithShelf, HiddenDownload) {
|
| WebContents* web_contents =
|
| browser()->tab_strip_model()->GetActiveWebContents();
|
| std::unique_ptr<DownloadUrlParameters> params(
|
| - DownloadUrlParameters::FromWebContents(web_contents, url));
|
| + DownloadUrlParameters::CreateForWebContentsMainFrame(
|
| + web_contents, url));
|
| params->set_callback(base::Bind(&SetHiddenDownloadCallback));
|
| download_manager->DownloadUrl(std::move(params));
|
| observer->WaitForFinished();
|
|
|