Revert of Teach navigation throttles how to cancel requests in WillProcessResponse.

content/browser/frame_host/navigation_handle_impl.cc

 // Copyright 2015 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.
 
 #include "content/browser/frame_host/navigation_handle_impl.h"
 
 #include <utility>
 
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/navigator.h"
@@ skipping 129 matching lines @@
 
 bool NavigationHandleImpl::HasCommitted() {
   return state_ == DID_COMMIT || state_ == DID_COMMIT_ERROR_PAGE;
 }
 
 bool NavigationHandleImpl::IsErrorPage() {
   return state_ == DID_COMMIT_ERROR_PAGE;
 }
 
 void NavigationHandleImpl::Resume() {
-  if (state_ != DEFERRING_START && state_ != DEFERRING_REDIRECT &&
-      state_ != DEFERRING_RESPONSE) {
+  if (state_ != DEFERRING_START && state_ != DEFERRING_REDIRECT)
     return;
-  }
 
   NavigationThrottle::ThrottleCheckResult result = NavigationThrottle::DEFER;
   if (state_ == DEFERRING_START) {
     result = CheckWillStartRequest();
-  } else if (state_ == DEFERRING_REDIRECT) {
+  } else {
     result = CheckWillRedirectRequest();
-  } else {
-    result = CheckWillProcessResponse();
-
-    // If the navigation is about to proceed after processing the response, then
-    // it's ready to commit.
-    if (result == NavigationThrottle::PROCEED)
-      ReadyToCommitNavigation(render_frame_host_, response_headers_);
   }
 
   if (result != NavigationThrottle::DEFER)
     RunCompleteCallback(result);
 }
 
 void NavigationHandleImpl::CancelDeferredNavigation(
     NavigationThrottle::ThrottleCheckResult result) {
   DCHECK(state_ == DEFERRING_START || state_ == DEFERRING_REDIRECT);
   DCHECK(result == NavigationThrottle::CANCEL_AND_IGNORE ||
@@ skipping 104 matching lines @@
   complete_callback_ = callback;
 
   // Notify each throttle of the request.
   NavigationThrottle::ThrottleCheckResult result = CheckWillRedirectRequest();
 
   // If the navigation is not deferred, run the callback.
   if (result != NavigationThrottle::DEFER)
     RunCompleteCallback(result);
 }
 
-void NavigationHandleImpl::WillProcessResponse(
-    RenderFrameHostImpl* render_frame_host,
-    scoped_refptr<net::HttpResponseHeaders> response_headers,
-    const ThrottleChecksFinishedCallback& callback) {
-  DCHECK(!render_frame_host_ || render_frame_host_ == render_frame_host);
-  render_frame_host_ = render_frame_host;
-  response_headers_ = response_headers;
-  state_ = WILL_PROCESS_RESPONSE;
-  complete_callback_ = callback;
-
-  // Notify each throttle of the response.
-  NavigationThrottle::ThrottleCheckResult result = CheckWillProcessResponse();
-
-  // If the navigation is about to proceed, then it's ready to commit.
-  if (result == NavigationThrottle::PROCEED)
-    ReadyToCommitNavigation(render_frame_host, response_headers);
-
-  // If the navigation is not deferred, run the callback.
-  if (result != NavigationThrottle::DEFER)
-    RunCompleteCallback(result);
-}
-
 void NavigationHandleImpl::DidRedirectNavigation(const GURL& new_url) {
   url_ = new_url;
   GetDelegate()->DidRedirectNavigation(this);
 }
 
 void NavigationHandleImpl::ReadyToCommitNavigation(
     RenderFrameHostImpl* render_frame_host,
     scoped_refptr<net::HttpResponseHeaders> response_headers) {
   DCHECK(!render_frame_host_ || render_frame_host_ == render_frame_host);
   render_frame_host_ = render_frame_host;
@@ skipping 70 matching lines @@
 
       default:
         NOTREACHED();
     }
   }
   next_index_ = 0;
   state_ = WILL_REDIRECT_REQUEST;
   return NavigationThrottle::PROCEED;
 }
 
-NavigationThrottle::ThrottleCheckResult
-NavigationHandleImpl::CheckWillProcessResponse() {
-  DCHECK(state_ == WILL_PROCESS_RESPONSE || state_ == DEFERRING_RESPONSE);
-  DCHECK(state_ != WILL_PROCESS_RESPONSE || next_index_ == 0);
-  DCHECK(state_ != DEFERRING_RESPONSE || next_index_ != 0);
-  for (size_t i = next_index_; i < throttles_.size(); ++i) {
-    NavigationThrottle::ThrottleCheckResult result =
-        throttles_[i]->WillProcessResponse();
-    switch (result) {
-      case NavigationThrottle::PROCEED:
-        continue;
-
-      case NavigationThrottle::CANCEL:
-      case NavigationThrottle::CANCEL_AND_IGNORE:
-        state_ = CANCELING;
-        return result;
-
-      case NavigationThrottle::DEFER:
-        state_ = DEFERRING_RESPONSE;
-        next_index_ = i + 1;
-        return result;
-    }
-  }
-  next_index_ = 0;
-  state_ = WILL_PROCESS_RESPONSE;
-  return NavigationThrottle::PROCEED;
-}
-
 void NavigationHandleImpl::RunCompleteCallback(
     NavigationThrottle::ThrottleCheckResult result) {
   DCHECK(result != NavigationThrottle::DEFER);
+  if (!complete_callback_.is_null())
+    complete_callback_.Run(result);
 
-  ThrottleChecksFinishedCallback callback = complete_callback_;
   complete_callback_.Reset();
-
-  if (!callback.is_null())
-    callback.Run(result);
-
-  // No code after running the callback, as it might have resulted in our
-  // destruction.
 }
 
 }  // namespace content