Revert "Introduce AncestorThrottle, which will process 'X-Frame-Options' headers."

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/ancestor_throttle.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/browser/frame_host/navigator_delegate.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
 #include "content/browser/service_worker/service_worker_navigation_handle.h"
 #include "content/common/frame_messages.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/common/content_client.h"
 #include "net/url_request/redirect_info.h"
@@ skipping 145 matching lines @@
   CHECK_NE(INITIAL, state_)
       << "This accessor should not be called before the request is started.";
   return is_external_protocol_;
 }
 
 net::Error NavigationHandleImpl::GetNetErrorCode() {
   return net_error_code_;
 }
 
 RenderFrameHostImpl* NavigationHandleImpl::GetRenderFrameHost() {
-  CHECK_GE(state_, WILL_PROCESS_RESPONSE)
+  CHECK(state_ >= READY_TO_COMMIT)
       << "This accessor should only be called "
-         "after a response has been received.";
+         "after the navigation is ready to commit.";
   return render_frame_host_;
 }
 
 bool NavigationHandleImpl::IsSamePage() {
   DCHECK(state_ == DID_COMMIT || state_ == DID_COMMIT_ERROR_PAGE)
       << "This accessor should not be called before the navigation has "
          "committed.";
   return is_same_page_;
 }
 
@@ skipping 102 matching lines @@
   // Update the navigation parameters.
   method_ = method;
   sanitized_referrer_ = sanitized_referrer;
   has_user_gesture_ = has_user_gesture;
   transition_ = transition;
   is_external_protocol_ = is_external_protocol;
 
   state_ = WILL_SEND_REQUEST;
   complete_callback_ = callback;
 
-  // Register the platform's navigation throttles.
-  std::unique_ptr<content::NavigationThrottle> ancestor_throttle =
-      content::AncestorThrottle::MaybeCreateThrottleFor(this);
-  if (ancestor_throttle)
-    throttles_.push_back(std::move(ancestor_throttle));
-
-  // Register the embedder's navigation throttles.
+  // Register the navigation throttles. The ScopedVector returned by
+  // GetNavigationThrottles is not assigned to throttles_ directly because it
+  // would overwrite any throttle previously added with
+  // RegisterThrottleForTesting.
   ScopedVector<NavigationThrottle> throttles_to_register =
       GetContentClient()->browser()->CreateThrottlesForNavigation(this);
   if (throttles_to_register.size() > 0) {
     throttles_.insert(throttles_.end(), throttles_to_register.begin(),
                       throttles_to_register.end());
     throttles_to_register.weak_clear();
   }
 
   // Notify each throttle of the request.
   NavigationThrottle::ThrottleCheckResult result = CheckWillStartRequest();
@@ skipping 96 matching lines @@
       case NavigationThrottle::CANCEL:
       case NavigationThrottle::CANCEL_AND_IGNORE:
         state_ = CANCELING;
         return result;
 
       case NavigationThrottle::DEFER:
         state_ = DEFERRING_START;
         next_index_ = i + 1;
         return result;
 
-      case NavigationThrottle::BLOCK_RESPONSE:
+      default:
         NOTREACHED();
     }
   }
   next_index_ = 0;
   state_ = WILL_SEND_REQUEST;
   return NavigationThrottle::PROCEED;
 }
 
 NavigationThrottle::ThrottleCheckResult
 NavigationHandleImpl::CheckWillRedirectRequest() {
@@ skipping 10 matching lines @@
       case NavigationThrottle::CANCEL:
       case NavigationThrottle::CANCEL_AND_IGNORE:
         state_ = CANCELING;
         return result;
 
       case NavigationThrottle::DEFER:
         state_ = DEFERRING_REDIRECT;
         next_index_ = i + 1;
         return result;
 
-      case NavigationThrottle::BLOCK_RESPONSE:
+      default:
         NOTREACHED();
     }
   }
   next_index_ = 0;
   state_ = WILL_REDIRECT_REQUEST;
 
   // Notify the delegate that a redirect was encountered and will be followed.
   if (GetDelegate())
     GetDelegate()->DidRedirectNavigation(this);
 
   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::BLOCK_RESPONSE:
       case NavigationThrottle::CANCEL:
       case NavigationThrottle::CANCEL_AND_IGNORE:
         state_ = CANCELING;
         return result;
 
       case NavigationThrottle::DEFER:
         state_ = DEFERRING_RESPONSE;
         next_index_ = i + 1;
         return result;
     }
@@ skipping 11 matching lines @@
   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