Merge r21417 to 172....

net/url_request/url_request.cc

Index: net/url_request/url_request.cc
===================================================================
--- net/url_request/url_request.cc	(revision 23600)
+++ net/url_request/url_request.cc	(working copy)
@@ -250,6 +250,7 @@
     job_->SetUpload(upload_.get());
 
   is_pending_ = true;
+
   response_info_.request_time = Time::Now();
   response_info_.was_cached = false;
 
@@ -319,6 +320,12 @@
   return job_->Read(dest, dest_size, bytes_read);
 }
 
+void URLRequest::FollowDeferredRedirect() {
+  DCHECK(job_);
+
+  job_->FollowDeferredRedirect();
+}
+
 void URLRequest::SetAuth(const wstring& username, const wstring& password) {
   DCHECK(job_);
   DCHECK(job_->NeedsAuth());
@@ -340,6 +347,7 @@
 }
 
 void URLRequest::OrphanJob() {
+  job_->Kill();
   job_->DetachRequest();  // ensures that the job will not call us again
   job_ = NULL;
 }
@@ -380,7 +388,6 @@
   }
   url_ = location;
   upload_ = NULL;
-  status_ = URLRequestStatus();
   --redirect_limit_;
 
   if (strip_post_specific_headers) {
@@ -399,8 +406,10 @@
     final_upload_progress_ = job_->GetUploadProgress();
   }
 
+  job_->Kill();
   OrphanJob();
 
+  status_ = URLRequestStatus();
   is_pending_ = false;
   Start();
   return net::OK;