Revert of Fix a pair of ResourceLoader cancellation/error bugs.

net/url_request/url_request_test_job.cc

Index: net/url_request/url_request_test_job.cc
diff --git a/net/url_request/url_request_test_job.cc b/net/url_request/url_request_test_job.cc
index 42e8c68fb1d85435e7e05e4ab65aa35f5138de26..1f5824babc12d245060e0390407cdb257de4aa26 100644
--- a/net/url_request/url_request_test_job.cc
+++ b/net/url_request/url_request_test_job.cc
@@ -56,9 +56,6 @@
 GURL URLRequestTestJob::test_url_error() {
   return GURL("test:error");
 }
-GURL URLRequestTestJob::test_url_redirect_to_url_1() {
-  return GURL("test:redirect_to_1");
-}
 GURL URLRequestTestJob::test_url_redirect_to_url_2() {
   return GURL("test:redirect_to_2");
 }
@@ -93,17 +90,6 @@
       "Location: somewhere\n"
       "\n";
   return std::string(kHeaders, arraysize(kHeaders));
-}
-
-// static getter for redirect response headers
-std::string URLRequestTestJob::test_redirect_to_url_1_headers() {
-  std::string headers = "HTTP/1.1 302 MOVED";
-  headers.push_back('\n');
-  headers += "Location: ";
-  headers += test_url_1().spec();
-  headers.push_back('\n');
-  headers.push_back('\n');
-  return headers;
 }
 
 // static getter for redirect response headers
@@ -213,8 +199,6 @@
       response_data_ = test_data_3();
     } else if (request_->url().spec() == test_url_4().spec()) {
       response_data_ = test_data_4();
-    } else if (request_->url().spec() == test_url_redirect_to_url_1().spec()) {
-      SetResponseHeaders(test_redirect_to_url_1_headers());
     } else if (request_->url().spec() == test_url_redirect_to_url_2().spec()) {
       SetResponseHeaders(test_redirect_to_url_2_headers());
     } else {