Removed calls to URLRequest::URLRequest in favor of URLRequestContext::CreateRequest
This patch is by departed intern [email protected], but it failed to pass the CQ for reasons unrelated to the patch.
Original review at http://codereview.chromium.org/10870060/ .
[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected]
BUG=142945
Review URL: https://chromiumcodereview.appspot.com/10910044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154550 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/net/chrome_fraudulent_certificate_reporter.cc b/chrome/browser/net/chrome_fraudulent_certificate_reporter.cc
index 753154c..2a119934 100644
--- a/chrome/browser/net/chrome_fraudulent_certificate_reporter.cc
+++ b/chrome/browser/net/chrome_fraudulent_certificate_reporter.cc
@@ -56,7 +56,7 @@
net::URLRequest* ChromeFraudulentCertificateReporter::CreateURLRequest(
net::URLRequestContext* context) {
- net::URLRequest* request = new net::URLRequest(upload_url_, this, context);
+ net::URLRequest* request = context->CreateRequest(upload_url_, this);
request->set_load_flags(net::LOAD_DO_NOT_SEND_COOKIES |
net::LOAD_DO_NOT_SAVE_COOKIES);
return request;
diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc
index 2bebe6e..6940462b 100644
--- a/chrome/browser/net/connection_tester.cc
+++ b/chrome/browser/net/connection_tester.cc
@@ -402,9 +402,7 @@
return;
}
// Fetch a request using the experimental context.
- request_.reset(new net::URLRequest(experiment.url,
- this,
- request_context_.get()));
+ request_.reset(request_context_->CreateRequest(experiment.url, this));
request_->Start();
}
diff --git a/chrome/browser/net/http_pipelining_compatibility_client.cc b/chrome/browser/net/http_pipelining_compatibility_client.cc
index b13bed1..1cfe5cc0 100644
--- a/chrome/browser/net/http_pipelining_compatibility_client.cc
+++ b/chrome/browser/net/http_pipelining_compatibility_client.cc
@@ -21,6 +21,7 @@
#include "net/http/http_version.h"
#include "net/proxy/proxy_config.h"
#include "net/proxy/proxy_service.h"
+#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h"
namespace chrome_browser_net {
@@ -88,9 +89,8 @@
net::URLRequestContext* url_request_context)
: delegate_(delegate),
request_id_(request_id),
- url_request_(new net::URLRequest(GURL(base_url + info.filename),
- this,
- url_request_context)),
+ url_request_(url_request_context->CreateRequest(
+ GURL(base_url + info.filename), this)),
info_(info),
response_code_(0) {
url_request_->set_load_flags(net::LOAD_BYPASS_CACHE |
diff --git a/chrome/browser/plugin_installer.cc b/chrome/browser/plugin_installer.cc
index c85e4fa..e6449eb8 100644
--- a/chrome/browser/plugin_installer.cc
+++ b/chrome/browser/plugin_installer.cc
@@ -26,6 +26,7 @@
#include "content/public/browser/resource_dispatcher_host.h"
#include "content/public/browser/web_contents.h"
#include "net/url_request/url_request.h"
+#include "net/url_request/url_request_context.h"
#include "webkit/plugins/npapi/plugin_group.h"
using content::BrowserContext;
@@ -45,10 +46,8 @@
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
ResourceDispatcherHost* rdh = ResourceDispatcherHost::Get();
- scoped_ptr<net::URLRequest> request(new net::URLRequest(
- url,
- NULL,
- resource_context->GetRequestContext()));
+ scoped_ptr<net::URLRequest> request(
+ resource_context->GetRequestContext()->CreateRequest(url, NULL));
net::Error error = rdh->BeginDownload(
request.Pass(),
false, // is_content_initiated
diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc
index 2c77fc84..90a985f3 100644
--- a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc
+++ b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc
@@ -105,10 +105,9 @@
protected:
net::URLRequest* MakeURLRequest(
net::URLRequestContextGetter* context_getter) {
- net::URLRequest* request = new net::URLRequest(
- GURL("https://example"),
- NULL,
- context_getter->GetURLRequestContext());
+ net::URLRequest* request =
+ context_getter->GetURLRequestContext()->CreateRequest(
+ GURL("https://example"), NULL);
return request;
}
diff --git a/content/browser/debugger/devtools_http_handler_impl.cc b/content/browser/debugger/devtools_http_handler_impl.cc
index aacf2ea..7147ce6 100644
--- a/content/browser/debugger/devtools_http_handler_impl.cc
+++ b/content/browser/debugger/devtools_http_handler_impl.cc
@@ -249,13 +249,10 @@
return;
}
std::string base_url = delegate_->GetFrontendResourcesBaseURL();
- request = new net::URLRequest(GURL(base_url + filename),
- this,
- request_context);
+ request = request_context->CreateRequest(GURL(base_url + filename), this);
} else if (info.path.find("/thumb/") == 0) {
- request = new net::URLRequest(GURL("chrome:/" + info.path),
- this,
- request_context);
+ request = request_context->CreateRequest(
+ GURL("chrome:/" + info.path), this);
} else {
server_->Send404(connection_id);
return;
diff --git a/content/browser/download/download_manager_impl.cc b/content/browser/download/download_manager_impl.cc
index 8f2b1755..5b0319a 100644
--- a/content/browser/download/download_manager_impl.cc
+++ b/content/browser/download/download_manager_impl.cc
@@ -41,6 +41,7 @@
#include "content/public/browser/web_contents_delegate.h"
#include "net/base/load_flags.h"
#include "net/base/upload_data.h"
+#include "net/url_request/url_request_context.h"
#include "webkit/glue/webkit_glue.h"
using content::BrowserThread;
@@ -79,10 +80,9 @@
// ResourceDispatcherHost{Base} is-not-a URLRequest::Delegate, and
// DownloadUrlParameters can-not include resource_dispatcher_host_impl.h, so
// we must down cast. RDHI is the only subclass of RDH as of 2012 May 4.
- scoped_ptr<net::URLRequest> request(new net::URLRequest(
- params->url(),
- NULL,
- params->resource_context()->GetRequestContext()));
+ scoped_ptr<net::URLRequest> request(
+ params->resource_context()->GetRequestContext()->CreateRequest(
+ params->url(), NULL));
request->set_referrer(params->referrer().url.spec());
webkit_glue::ConfigureURLRequestForReferrerPolicy(
request.get(), params->referrer().policy);
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
index 11738b2..aa971df 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -731,10 +731,8 @@
const string16& suggested_name) {
DownloadSaveInfo save_info;
save_info.suggested_name = suggested_name;
- scoped_ptr<net::URLRequest> request(new net::URLRequest(
- url,
- NULL,
- resource_context_->GetRequestContext()));
+ scoped_ptr<net::URLRequest> request(
+ resource_context_->GetRequestContext()->CreateRequest(url, NULL));
request->set_referrer(referrer.url.spec());
webkit_glue::ConfigureURLRequestForReferrerPolicy(
request.get(), referrer.policy);
diff --git a/content/browser/renderer_host/resource_dispatcher_host_impl.cc b/content/browser/renderer_host/resource_dispatcher_host_impl.cc
index 450641e..85544664 100644
--- a/content/browser/renderer_host/resource_dispatcher_host_impl.cc
+++ b/content/browser/renderer_host/resource_dispatcher_host_impl.cc
@@ -933,10 +933,9 @@
// chance to reset some state before we complete the transfer.
deferred_loader->WillCompleteTransfer();
} else {
- new_request.reset(new net::URLRequest(
- request_data.url,
- NULL,
- filter_->GetURLRequestContext(request_data.resource_type)));
+ net::URLRequestContext* context =
+ filter_->GetURLRequestContext(request_data.resource_type);
+ new_request.reset(context->CreateRequest(request_data.url, NULL));
request = new_request.get();
request->set_method(request_data.method);
@@ -1256,7 +1255,7 @@
}
scoped_ptr<net::URLRequest> request(
- new net::URLRequest(url, NULL, request_context));
+ request_context->CreateRequest(url, NULL));
request->set_method("GET");
request->set_referrer(MaybeStripReferrer(referrer.url).spec());
webkit_glue::ConfigureURLRequestForReferrerPolicy(request.get(),
diff --git a/webkit/appcache/appcache_update_job.cc b/webkit/appcache/appcache_update_job.cc
index 29e3b1a4..1092904 100644
--- a/webkit/appcache/appcache_update_job.cc
+++ b/webkit/appcache/appcache_update_job.cc
@@ -15,6 +15,7 @@
#include "net/base/net_errors.h"
#include "net/http/http_request_headers.h"
#include "net/http/http_response_headers.h"
+#include "net/url_request/url_request_context.h"
#include "webkit/appcache/appcache_group.h"
#include "webkit/appcache/appcache_histograms.h"
@@ -97,10 +98,8 @@
fetch_type_(fetch_type),
retry_503_attempts_(0),
buffer_(new net::IOBuffer(kBufferSize)),
- ALLOW_THIS_IN_INITIALIZER_LIST(
- request_(new net::URLRequest(url,
- this,
- job->service_->request_context()))) {
+ ALLOW_THIS_IN_INITIALIZER_LIST(request_(
+ job->service_->request_context()->CreateRequest(url, this))) {
}
AppCacheUpdateJob::URLFetcher::~URLFetcher() {
@@ -288,9 +287,7 @@
return false;
}
++retry_503_attempts_;
- request_.reset(new net::URLRequest(url_,
- this,
- job_->service_->request_context()));
+ request_.reset(job_->service_->request_context()->CreateRequest(url_, this));
Start();
return true;
}
diff --git a/webkit/appcache/appcache_url_request_job_unittest.cc b/webkit/appcache/appcache_url_request_job_unittest.cc
index 9fa8ded9..400998b2 100644
--- a/webkit/appcache/appcache_url_request_job_unittest.cc
+++ b/webkit/appcache/appcache_url_request_job_unittest.cc
@@ -443,10 +443,8 @@
base::Unretained(this)));
AppCacheStorage* storage = service_->storage();
- request_.reset(
- new net::URLRequest(GURL("http://blah/"),
- url_request_delegate_.get(),
- &empty_context_));
+ request_.reset(empty_context_.CreateRequest(
+ GURL("http://blah/"), url_request_delegate_.get()));
// Setup to create an AppCacheURLRequestJob with orders to deliver
// a network response.
@@ -479,10 +477,8 @@
base::Unretained(this)));
AppCacheStorage* storage = service_->storage();
- request_.reset(
- new net::URLRequest(GURL("http://blah/"),
- url_request_delegate_.get(),
- &empty_context_));
+ request_.reset(empty_context_.CreateRequest(GURL(
+ "http://blah/"), url_request_delegate_.get()));
// Setup to create an AppCacheURLRequestJob with orders to deliver
// a network response.
@@ -530,10 +526,8 @@
void RequestAppCachedResource(bool start_after_delivery_orders) {
AppCacheStorage* storage = service_->storage();
- request_.reset(
- new net::URLRequest(GURL("http://blah/"),
- url_request_delegate_.get(),
- &empty_context_));
+ request_.reset(empty_context_.CreateRequest(
+ GURL("http://blah/"), url_request_delegate_.get()));
// Setup to create an AppCacheURLRequestJob with orders to deliver
// a network response.
@@ -644,10 +638,8 @@
void MakeRangeRequest() {
AppCacheStorage* storage = service_->storage();
- request_.reset(
- new net::URLRequest(GURL("http://blah/"),
- url_request_delegate_.get(),
- &empty_context_));
+ request_.reset(empty_context_.CreateRequest(
+ GURL("http://blah/"), url_request_delegate_.get()));
// Request a range, the 3 middle chars out of 'Hello'
net::HttpRequestHeaders extra_headers;
diff --git a/webkit/blob/blob_url_request_job_unittest.cc b/webkit/blob/blob_url_request_job_unittest.cc
index 3463d01..3afde19 100644
--- a/webkit/blob/blob_url_request_job_unittest.cc
+++ b/webkit/blob/blob_url_request_job_unittest.cc
@@ -243,9 +243,8 @@
const net::HttpRequestHeaders& extra_headers,
BlobData* blob_data) {
// This test has async steps.
- request_.reset(new net::URLRequest(GURL("blob:blah"),
- url_request_delegate_.get(),
- &empty_context_));
+ request_.reset(empty_context_.CreateRequest(
+ GURL("blob:blah"), url_request_delegate_.get()));
request_->set_method(method);
blob_url_request_job_ = new BlobURLRequestJob(
request_.get(),
diff --git a/webkit/chromeos/fileapi/remote_file_system_operation.cc b/webkit/chromeos/fileapi/remote_file_system_operation.cc
index 23f687a..c7dfce6e 100644
--- a/webkit/chromeos/fileapi/remote_file_system_operation.cc
+++ b/webkit/chromeos/fileapi/remote_file_system_operation.cc
@@ -9,6 +9,7 @@
#include "base/platform_file.h"
#include "base/values.h"
#include "googleurl/src/gurl.h"
+#include "net/url_request/url_request_context.h"
#include "webkit/chromeos/fileapi/remote_file_stream_writer.h"
#include "webkit/fileapi/file_system_callback_dispatcher.h"
#include "webkit/fileapi/file_system_url.h"
@@ -126,8 +127,8 @@
url,
offset))));
- scoped_ptr<net::URLRequest> blob_request(new net::URLRequest(
- blob_url, file_writer_delegate_.get(), url_request_context));
+ scoped_ptr<net::URLRequest> blob_request(url_request_context->CreateRequest(
+ blob_url, file_writer_delegate_.get()));
file_writer_delegate_->Start(blob_request.Pass());
}
diff --git a/webkit/fileapi/file_system_dir_url_request_job_unittest.cc b/webkit/fileapi/file_system_dir_url_request_job_unittest.cc
index 9294ffd..234d88a 100644
--- a/webkit/fileapi/file_system_dir_url_request_job_unittest.cc
+++ b/webkit/fileapi/file_system_dir_url_request_job_unittest.cc
@@ -84,9 +84,7 @@
void TestRequestHelper(const GURL& url, bool run_to_completion) {
delegate_.reset(new TestDelegate());
delegate_->set_quit_on_redirect(true);
- request_.reset(new net::URLRequest(url,
- delegate_.get(),
- &empty_context_));
+ request_.reset(empty_context_.CreateRequest(url, delegate_.get()));
job_ = new FileSystemDirURLRequestJob(
request_.get(),
empty_context_.network_delegate(),
diff --git a/webkit/fileapi/file_system_url_request_job_unittest.cc b/webkit/fileapi/file_system_url_request_job_unittest.cc
index ce77edd..dde4fd5b 100644
--- a/webkit/fileapi/file_system_url_request_job_unittest.cc
+++ b/webkit/fileapi/file_system_url_request_job_unittest.cc
@@ -111,8 +111,7 @@
// Make delegate_ exit the MessageLoop when the request is done.
delegate_->set_quit_on_complete(true);
delegate_->set_quit_on_redirect(true);
- request_.reset(
- new net::URLRequest(url, delegate_.get(), &empty_context_));
+ request_.reset(empty_context_.CreateRequest(url, delegate_.get()));
if (headers)
request_->SetExtraRequestHeaders(*headers);
ASSERT_TRUE(!job_);
diff --git a/webkit/fileapi/file_writer_delegate_unittest.cc b/webkit/fileapi/file_writer_delegate_unittest.cc
index 3b1a515a..0ed0f27d 100644
--- a/webkit/fileapi/file_writer_delegate_unittest.cc
+++ b/webkit/fileapi/file_writer_delegate_unittest.cc
@@ -113,9 +113,8 @@
result_.reset(new Result());
file_writer_delegate_.reset(
CreateWriterDelegate("test", offset, allowed_growth, result_.get()));
- request_.reset(new net::URLRequest(blob_url,
- file_writer_delegate_.get(),
- &empty_context_));
+ request_.reset(empty_context_.CreateRequest(
+ blob_url, file_writer_delegate_.get()));
}
static net::URLRequest::ProtocolFactory Factory;
@@ -344,9 +343,8 @@
result2.reset(new Result());
file_writer_delegate2.reset(CreateWriterDelegate(
"test2", 0, quota::QuotaManager::kNoLimit, result2.get()));
- request2.reset(new net::URLRequest(kBlobURL2,
- file_writer_delegate2.get(),
- &empty_context_));
+ request2.reset(empty_context_.CreateRequest(
+ kBlobURL2, file_writer_delegate2.get()));
ASSERT_EQ(0, test_helper_.GetCachedOriginUsage());
file_writer_delegate_->Start(request_.Pass());
diff --git a/webkit/fileapi/local_file_system_operation.cc b/webkit/fileapi/local_file_system_operation.cc
index 18f1dd2..5caff1b 100644
--- a/webkit/fileapi/local_file_system_operation.cc
+++ b/webkit/fileapi/local_file_system_operation.cc
@@ -313,10 +313,8 @@
writer.Pass()));
set_write_callback(callback);
- scoped_ptr<net::URLRequest> blob_request(
- new net::URLRequest(blob_url,
- file_writer_delegate_.get(),
- url_request_context));
+ scoped_ptr<net::URLRequest> blob_request(url_request_context->CreateRequest(
+ blob_url, file_writer_delegate_.get()));
file_writer_delegate_->Start(blob_request.Pass());
}
diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
index a6becac9..1be9a36 100644
--- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc
+++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
@@ -59,6 +59,7 @@
#include "net/http/http_request_headers.h"
#include "net/http/http_response_headers.h"
#include "net/url_request/url_request.h"
+#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_job.h"
#include "webkit/appcache/appcache_interfaces.h"
#include "webkit/blob/blob_storage_controller.h"
@@ -416,7 +417,7 @@
// actions performed on the owner's thread.
void AsyncStart(RequestParams* params) {
- request_.reset(new net::URLRequest(params->url, this, g_request_context));
+ request_.reset(g_request_context->CreateRequest(params->url, this));
request_->set_method(params->method);
request_->set_first_party_for_cookies(params->first_party_for_cookies);
request_->set_referrer(params->referrer.spec());
