Revert of Add a NavigationThrottle to the public content/ interface

content/browser/frame_host/navigation_handle_impl.h

Index: content/browser/frame_host/navigation_handle_impl.h
diff --git a/content/browser/frame_host/navigation_handle_impl.h b/content/browser/frame_host/navigation_handle_impl.h
index aebb9298cad02f5d3ddeaa790818e75ea700f819..861adb01933d60277a21e85be6d660bb4845a3f6 100644
--- a/content/browser/frame_host/navigation_handle_impl.h
+++ b/content/browser/frame_host/navigation_handle_impl.h
@@ -9,9 +9,7 @@
 
 #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 {
@@ -55,37 +53,18 @@
 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;
@@ -100,21 +79,6 @@
     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);
@@ -126,8 +90,7 @@
  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,
   };
@@ -138,17 +101,10 @@
 
   // 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.
@@ -158,9 +114,6 @@
   // navigation.
   NavigatorDelegate* delegate_;
 
-  // A list of Throttles registered for this navigation.
-  ScopedVector<NavigationThrottle> throttles_;
-
   DISALLOW_COPY_AND_ASSIGN(NavigationHandleImpl);
 };