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

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

Issue 10232010: DownloadUrlParameters (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: " Created 8 years, 8 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 2833a6745aeff2f4031c3cd98e702b2efc1fd8c1..216c73da0983c01c53e93768f068ca496bb6dedd 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -48,6 +48,7 @@
#include "content/public/browser/download_manager.h"
#include "content/public/browser/download_persistent_store_info.h"
#include "content/public/browser/download_save_info.h"
+#include "content/public/browser/download_url_parameters.h"
#include "content/public/browser/notification_source.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/resource_context.h"
@@ -66,6 +67,7 @@ using content::BrowserThread;
using content::DownloadItem;
using content::DownloadManager;
using content::DownloadPersistentStoreInfo;
+using content::DownloadUrlParameters;
using content::WebContents;
namespace {
@@ -668,9 +670,10 @@ class DownloadTest : public InProcessBrowserTest {
scoped_refptr<DownloadTestItemCreationObserver> creation_observer(
new DownloadTestItemCreationObserver);
- DownloadManagerForBrowser(browser())->DownloadUrl(
- url, GURL(""), "", false, -1, save_info, web_contents,
- creation_observer->callback());
+ DownloadUrlParameters* params = DownloadUrlParameters::FromWebContents(
+ web_contents, url, save_info);
+ params->set_callback(creation_observer->callback());
+ DownloadManagerForBrowser(browser())->DownloadUrl(params);
// Wait until the item is created, or we have determined that it
// won't be.
@@ -1969,8 +1972,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadUrl) {
content::DownloadSaveInfo save_info;
save_info.prompt_for_save_location = true;
DownloadManagerForBrowser(browser())->DownloadUrl(
- url, GURL(""), "", false, -1, save_info, web_contents,
- DownloadManager::OnStartedCallback());
+ DownloadUrlParameters::FromWebContents(web_contents, url, save_info));
observer->WaitForFinished();
EXPECT_EQ(1u, observer->NumDownloadsSeenInState(DownloadItem::COMPLETE));
CheckDownloadStates(1, DownloadItem::COMPLETE);
@@ -1999,8 +2001,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadUrlToPath) {
DownloadTestObserver* observer(CreateWaiter(browser(), 1));
DownloadManagerForBrowser(browser())->DownloadUrl(
- url, GURL(""), "", false, -1, save_info, web_contents,
- DownloadManager::OnStartedCallback());
+ DownloadUrlParameters::FromWebContents(web_contents, url, save_info));
observer->WaitForFinished();
EXPECT_EQ(1u, observer->NumDownloadsSeenInState(DownloadItem::COMPLETE));

Powered by Google App Engine
This is Rietveld 408576698