Add MaybeInterceptRedirect/Response to URLRequestInterceptor

net/url_request/url_request_test_util.cc

Index: net/url_request/url_request_test_util.cc
diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc
index 82d8579f54775a09015c345dd223022e9b1f8bb9..3fe3f493b0783c01dd359db59b2d7e7335afcb1a 100644
--- a/net/url_request/url_request_test_util.cc
+++ b/net/url_request/url_request_test_util.cc
@@ -317,11 +317,14 @@ TestNetworkDelegate::TestNetworkDelegate()
       blocked_set_cookie_count_(0),
       set_cookie_count_(0),
       observed_before_proxy_headers_sent_callbacks_(0),
+      before_send_headers_count_(0),
+      headers_received_count_(0),
       has_load_timing_info_before_redirect_(false),
       has_load_timing_info_before_auth_(false),
       can_access_files_(true),
       can_throttle_requests_(true),
-      cancel_request_with_policy_violating_referrer_(false) {
+      cancel_request_with_policy_violating_referrer_(false),
+      will_be_intercepted_on_next_error_(false) {
 }
 
 TestNetworkDelegate::~TestNetworkDelegate() {
@@ -386,7 +389,7 @@ int TestNetworkDelegate::OnBeforeSendHeaders(
   next_states_[req_id] =
       kStageSendHeaders |
       kStageCompletedError;  // request canceled by delegate
-
+  before_send_headers_count_++;
   return OK;
 }
 
@@ -408,7 +411,9 @@ void TestNetworkDelegate::OnSendHeaders(
       event_order_[req_id];
   next_states_[req_id] =
       kStageHeadersReceived |
-      kStageCompletedError;
+      kStageCompletedError |
+      (will_be_intercepted_on_next_error_ ? kStageResponseStarted : 0);

[mmenke, 2014/11/05 23:14:34]

Replace this with:

if (!will_be_intercepted_on_next_error_) {
  next_states_[req_id] = kStageHeadersReceived | kStageCompletedError;
} else {
  next_states_[req_id] = kStageResponseStarted;
}

That makes the flag more definitive about what will happen next.

[bengr, 2014/11/06 00:10:51]

Done.

+  will_be_intercepted_on_next_error_ = false;
 }
 
 int TestNetworkDelegate::OnHeadersReceived(
@@ -445,7 +450,7 @@ int TestNetworkDelegate::OnHeadersReceived(
     if (!allowed_unsafe_redirect_url_.is_empty())
       *allowed_unsafe_redirect_url = allowed_unsafe_redirect_url_;
   }
-
+  headers_received_count_++;
   return OK;
 }