Fix a pair of ResourceLoader cancellation/error bugs.

net/url_request/url_request_test_job.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_URL_REQUEST_URL_REQUEST_TEST_JOB_H_
 #define NET_URL_REQUEST_URL_REQUEST_TEST_JOB_H_
 
 #include <string>
 
 #include "base/memory/weak_ptr.h"
@@ skipping 51 matching lines @@
   ~URLRequestTestJob() override;
 
   // The canned URLs this handler will respond to without having been
   // explicitly initialized with response headers and data.
   // FIXME(brettw): we should probably also have a redirect one
   static GURL test_url_1();
   static GURL test_url_2();
   static GURL test_url_3();
   static GURL test_url_4();
   static GURL test_url_error();
+  static GURL test_url_redirect_to_url_1();
   static GURL test_url_redirect_to_url_2();

[mmenke, 2016/12/01 16:37:18]

It's not documented here, but we can't use test_url_redirect_to_url_2() because
test_url_2() blocks after each callback, and needs to be explicitly resumed
repeatedly.  (I really hate this class, and want to eventually get rid of it,
but have never had time to do so)

 
   // The data that corresponds to each of the URLs above
   static std::string test_data_1();
   static std::string test_data_2();
   static std::string test_data_3();
   static std::string test_data_4();
 
   // The headers that correspond to each of the URLs above
   static std::string test_headers();
 
   // The headers for a redirect response
   static std::string test_redirect_headers();
 
+  // The headers for a redirect response to the first test url.
+  static std::string test_redirect_to_url_1_headers();
+
   // The headers for a redirect response to the second test url.
   static std::string test_redirect_to_url_2_headers();
 
   // The headers for a server error response
   static std::string test_error_headers();
 
   // Processes one pending message from the stack, returning true if any
   // message was processed, or false if there are no more pending request
   // notifications to send. This is not applicable when using auto_advance.
   static bool ProcessOnePendingMessage();
@@ skipping 77 matching lines @@
 
   // Original size in bytes of the response headers before decoding.
   int response_headers_length_;
 
   base::WeakPtrFactory<URLRequestTestJob> weak_factory_;
 };
 
 }  // namespace net
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_TEST_JOB_H_