Revert of Add a NavigationThrottle to the public content/ interface

content/browser/frame_host/navigation_handle_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_
 
 #include "content/public/browser/navigation_handle.h"
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/memory/scoped_vector.h"
 #include "content/common/content_export.h"
-#include "content/public/browser/navigation_throttle.h"
 #include "url/gurl.h"
 
 namespace content {
 
 class NavigatorDelegate;
 struct NavigationRequestInfo;
 
 // This class keeps track of a single navigation. It is created upon receipt of
 // a DidStartProvisionalLoad IPC in a RenderFrameHost. The RenderFrameHost owns
 // the newly created NavigationHandleImpl as long as the navigation is ongoing.
@@ skipping 23 matching lines @@
 // navigation is ready to commit. The NavigationHandleImpl ownership is then
 // transferred to the RenderFrameHost in which the navigation will commit.
 //
 // When PlzNavigate is enabled, the NavigationHandleImpl will never be reset
 // following the receipt of a DidStartProvisionalLoad IPC. There are also no
 // transferring navigations. The other causes of NavigationHandleImpl reset in
 // the RenderFrameHost still apply.
 class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
  public:
   static scoped_ptr<NavigationHandleImpl> Create(const GURL& url,
-                                                 bool is_main_frame,
+                                                 const bool is_main_frame,
                                                  NavigatorDelegate* delegate);
+
   ~NavigationHandleImpl() override;
 
   // NavigationHandle implementation:
-  const GURL& GetURL() override;
-  bool IsInMainFrame() override;
-  bool IsPost() override;
-  const Referrer& GetReferrer() override;
-  bool HasUserGesture() override;
-  ui::PageTransition GetPageTransition() override;
-  bool IsExternalProtocol() override;
-  net::Error GetNetErrorCode() override;
+  const GURL& GetURL() const override;
+  net::Error GetNetErrorCode() const override;
+  bool IsInMainFrame() const override;
   bool IsSamePage() override;
-  bool HasCommittedDocument() override;
-  bool HasCommittedErrorPage() override;
-  void RegisterThrottleForTesting(
-      scoped_ptr<NavigationThrottle> navigation_throttle) override;
-  NavigationThrottle::ThrottleCheckResult CallWillStartRequestForTesting(
-      bool is_post,
-      const Referrer& sanitized_referrer,
-      bool has_user_gesture,
-      ui::PageTransition transition,
-      bool is_external_protocol) override;
-  NavigationThrottle::ThrottleCheckResult CallWillRedirectRequestForTesting(
-      const GURL& new_url,
-      bool new_method_is_post,
-      const GURL& new_referrer_url,
-      bool new_is_external_protocol) override;
-
-  NavigatorDelegate* delegate() const { return delegate_; }
+  bool HasCommittedDocument() const override;
+  bool HasCommittedErrorPage() const override;
 
   void set_net_error_code(net::Error net_error_code) {
     net_error_code_ = net_error_code;
   }
 
   // Returns whether the navigation is currently being transferred from one
   // RenderFrameHost to another. In particular, a DidStartProvisionalLoad IPC
   // for the navigation URL, received in the new RenderFrameHost, should not
   // indicate the start of a new navigation in that case.
   bool is_transferring() const { return is_transferring_; }
   void set_is_transferring(bool is_transferring) {
     is_transferring_ = is_transferring;
   }
 
-  // Called when the URLRequest will start in the network stack.
-  NavigationThrottle::ThrottleCheckResult WillStartRequest(
-      bool is_post,
-      const Referrer& sanitized_referrer,
-      bool has_user_gesture,
-      ui::PageTransition transition,
-      bool is_external_protocol);
-
-  // Called when the URLRequest will be redirected in the network stack.
-  NavigationThrottle::ThrottleCheckResult WillRedirectRequest(
-      const GURL& new_url,
-      bool new_method_is_post,
-      const GURL& new_referrer_url,
-      bool new_is_external_protocol);
-
   // Called when the navigation was redirected. This will update the |url_| and
   // inform the delegate.
   void DidRedirectNavigation(const GURL& new_url);
 
   // Called when the navigation was committed. This will update the |state_|
   // and inform the delegate,
   void DidCommitNavigation(bool same_page);
 
  private:
   // Used to track the state the navigation is currently in.
   enum State {
-    INITIAL = 0,
-    WILL_SEND_REQUEST,
+    DID_START = 0,
     DID_COMMIT,
     DID_COMMIT_ERROR_PAGE,
   };
 
   NavigationHandleImpl(const GURL& url,
                        const bool is_main_frame,
                        NavigatorDelegate* delegate);
 
   // See NavigationHandle for a description of those member variables.
   GURL url_;
+  net::Error net_error_code_;
+  State state_;
   const bool is_main_frame_;
-  bool is_post_;
-  Referrer sanitized_referrer_;
-  bool has_user_gesture_;
-  ui::PageTransition transition_;
-  bool is_external_protocol_;
-  net::Error net_error_code_;
   bool is_same_page_;
 
-  // The state the navigation is in.
-  State state_;
-
   // Whether the navigation is in the middle of a transfer. Set to false when
   // the DidStartProvisionalLoad is received from the new renderer.
   bool is_transferring_;
 
   // The delegate that should be notified about events related to this
   // navigation.
   NavigatorDelegate* delegate_;
 
-  // A list of Throttles registered for this navigation.
-  ScopedVector<NavigationThrottle> throttles_;
-
   DISALLOW_COPY_AND_ASSIGN(NavigationHandleImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_