Removed calls to URLRequest::URLRequest in favor of URLRequestContext::CreateRequest

This patch is by departed intern shalev@chromium.org, but it failed to pass the CQ for reasons unrelated to the patch.

Original review at http://codereview.chromium.org/10870060/ .

TBR=mmenke@chromium.org,michaeln@chromium.org,brettw@chromium.org,ben@chromium.org,zelidrag@chromium.org,phajdan.jr@chromium.org,pfeldman@chromium.org
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

2 files changed, 12 insertions, 23 deletions

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 @@ AppCacheUpdateJob::URLFetcher::URLFetcher(
       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 @@ bool AppCacheUpdateJob::URLFetcher::MaybeRetryRequest() {
     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 9fa8ded..400998b 100644
--- a/webkit/appcache/appcache_url_request_job_unittest.cc
+++ b/webkit/appcache/appcache_url_request_job_unittest.cc
@@ -443,10 +443,8 @@ class AppCacheURLRequestJobTest : public testing::Test {
                    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 @@ class AppCacheURLRequestJobTest : public testing::Test {
                    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 @@ class AppCacheURLRequestJobTest : public testing::Test {
 
   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 @@ class AppCacheURLRequestJobTest : public testing::Test {
 
   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;