Add MaybeInterceptRedirect/Response to URLRequestInterceptor

net/url_request/url_request_test_util.h

Index: net/url_request/url_request_test_util.h
diff --git a/net/url_request/url_request_test_util.h b/net/url_request/url_request_test_util.h
index 5784931383459fc451de777423c7e00d645d30e3..2b106fe109bfce18fabe899512a419f4d67c1675 100644
--- a/net/url_request/url_request_test_util.h
+++ b/net/url_request/url_request_test_util.h
@@ -275,12 +275,18 @@ class TestNetworkDelegate : public NetworkDelegate {
   int observed_before_proxy_headers_sent_callbacks() const {
     return observed_before_proxy_headers_sent_callbacks_;
   }
+  int before_send_headers_count() const { return before_send_headers_count_; }
+  int headers_received_count() const { return headers_received_count_; }
 
   // Last observed proxy in proxy header sent callback.
   HostPortPair last_observed_proxy() {
     return last_observed_proxy_;
   }
 
+  void set_can_be_intercepted_on_error(bool can_be_intercepted_on_error) {
+    can_be_intercepted_on_error_ = can_be_intercepted_on_error;
+  }
+
  protected:
   // NetworkDelegate:
   int OnBeforeURLRequest(URLRequest* request,
@@ -343,6 +349,8 @@ class TestNetworkDelegate : public NetworkDelegate {
   int blocked_set_cookie_count_;
   int set_cookie_count_;
   int observed_before_proxy_headers_sent_callbacks_;
+  int before_send_headers_count_;
+  int headers_received_count_;
   // Last observed proxy in before proxy header sent callback.
   HostPortPair last_observed_proxy_;
 
@@ -365,6 +373,7 @@ class TestNetworkDelegate : public NetworkDelegate {
   bool can_access_files_;  // true by default
   bool can_throttle_requests_;  // true by default
   bool cancel_request_with_policy_violating_referrer_;  // false by default
+  bool can_be_intercepted_on_error_;

[mmenke, 2014/11/05 18:43:43]

Maybe rename to will_be_intercepted_on_next_error_, and set 
next_states_[req_id] to kStageResponseStarted when it's set in
OnHeadersReceived, and then clear it?

[bengr, 2014/11/05 22:51:37]

I'm not sure what you mean. I set next_states_[req_id] to kStageResponseStarted
in OnSendHeaders. Should I be setting next_states_ elsewhere as well? I can
clear the will_be_intercepted_on_next_error_ flag in OnSendHeaders. I've done
that.

 };
 
 // Overrides the host used by the LocalHttpTestServer in