diff options
author | Ben Murdoch <benm@google.com> | 2013-07-10 11:40:50 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2013-07-10 11:40:50 +0100 |
commit | eb525c5499e34cc9c4b825d6d9e75bb07cc06ace (patch) | |
tree | d908ce4bfe1717d2cd53f41327d8b9ba8304355f /content/browser/download/download_manager_impl.cc | |
parent | 3c54152607de4272b3da0c146b71dcba8a0e5610 (diff) | |
download | chromium_org-eb525c5499e34cc9c4b825d6d9e75bb07cc06ace.tar.gz |
Merge from Chromium at DEPS revision r210036
This commit was generated by merge_to_master.py.
Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
Diffstat (limited to 'content/browser/download/download_manager_impl.cc')
-rw-r--r-- | content/browser/download/download_manager_impl.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/content/browser/download/download_manager_impl.cc b/content/browser/download/download_manager_impl.cc index f7a8b2ee2d..08e32c6a98 100644 --- a/content/browser/download/download_manager_impl.cc +++ b/content/browser/download/download_manager_impl.cc @@ -43,7 +43,6 @@ #include "net/base/upload_bytes_element_reader.h" #include "net/base/upload_data_stream.h" #include "net/url_request/url_request_context.h" -#include "webkit/glue/webkit_glue.h" namespace content { namespace { @@ -57,10 +56,6 @@ void BeginDownload(scoped_ptr<DownloadUrlParameters> params, scoped_ptr<net::URLRequest> request( params->resource_context()->GetRequestContext()->CreateRequest( params->url(), NULL)); - if (params->referrer().url.is_valid()) - request->SetReferrer(params->referrer().url.spec()); - webkit_glue::ConfigureURLRequestForReferrerPolicy( - request.get(), params->referrer().policy); request->set_load_flags(request->load_flags() | params->load_flags()); request->set_method(params->method()); if (!params->post_body().empty()) { @@ -124,8 +119,9 @@ void BeginDownload(scoped_ptr<DownloadUrlParameters> params, save_info->prompt_for_save_location = params->prompt(); save_info->file_stream = params->GetFileStream(); - params->resource_dispatcher_host()->BeginDownload( + ResourceDispatcherHost::Get()->BeginDownload( request.Pass(), + params->referrer(), params->content_initiated(), params->resource_context(), params->render_process_host_id(), |