Add a NavigationThrottle to the public content/ interface

content/public/browser/navigation_handle.h

Index: content/public/browser/navigation_handle.h
diff --git a/content/public/browser/navigation_handle.h b/content/public/browser/navigation_handle.h
index 49d0884de43256e204ad3159903db42e889d1af6..cc825f08013c19beee0f351115441866154973b1 100644
--- a/content/public/browser/navigation_handle.h
+++ b/content/public/browser/navigation_handle.h
@@ -6,33 +6,85 @@
 #define CONTENT_PUBLIC_BROWSER_NAVIGATION_HANDLE_H_
 
 #include "content/common/content_export.h"
+#include "content/public/common/referrer.h"
 #include "net/base/net_errors.h"
+#include "ui/base/page_transition_types.h"
 
 class GURL;
 
 namespace content {
+class NavigationThrottle;
 
 // A NavigationHandle tracks information related to a single navigation.
 class CONTENT_EXPORT NavigationHandle {
  public:
   virtual ~NavigationHandle() {}
 
+  // Parameters available at navigation start time -----------------------------
+
+  // These parameters are always available during the navigation. Note that
+  // some may change during navigation (e.g. due to server redirects).
+
   // The URL the frame is navigating to. This may change during the navigation
   // when encountering a server redirect.
   virtual const GURL& GetURL() const = 0;
 
-  // The net error code if an error happened prior to commit. Otherwise it will
-  // be net::OK.
-  virtual net::Error GetNetErrorCode() const = 0;
+  // A sanitized version of the URL the frame is navigating to. It may change
+  // during the navigation when encountering a server redirect.
+  virtual const GURL& GetValidatedURL() const = 0;
 
   // Whether the navigation is taking place in the main frame or in a subframe.
+  // This remains constant over the navigation lifetime.
   virtual bool IsInMainFrame() const = 0;
 
+  // Parameters available at network request start time ------------------------
+
+  // The following parameters are only available when the network request is
+  // made for the navigation (or at commit time if not network request is made).

[nasko, 2015/09/04 00:01:53]

nit: "no network request"

[clamy, 2015/09/08 16:27:19]

Done.

+  // This corresponds to NavigationThrottle::WillSendRequest. They should not
+  // be queried before that.
+
+  // Whether the navigation is a POST or not. This may change during the
+  // navigation when encountering a server redirect.
+  virtual bool IsPost() const = 0;
+
+  // Returns a sanitized version of the referrer for this request.
+  virtual const Referrer& GetReferrer() const = 0;
+
+  // Whether the navigation was initiated by a user gesture. Note that this
+  // will return false for browser-initiated navigations.
+  // TODO(clamy): when PlzNavigate launches, this should return true for
+  // browser-initiated navigations.
+  virtual bool HasUserGesture() const = 0;
+
+  // Returns the page transition type.
+  virtual ui::PageTransition GetPageTransition() const = 0;
+
+  // Whether the target URL cannot be handled by the browser's internal protocol
+  // handlers.
+  virtual bool IsExternalProtocol() const = 0;
+
+  // Navigation control flow --------------------------------------------------
+
+  // The net error code if an error happened prior to commit. Otherwise it will
+  // be net::OK.
+  virtual net::Error GetNetErrorCode() const = 0;
+
   // Whether the navigation has successfully committed a document.
   virtual bool HasCommittedDocument() const = 0;
 
   // Whether an error page has committed for the navigation.
   virtual bool HasCommittedErrorPage() const = 0;
+
+  // Registers a NavigationThrottle for tests. The throttle can
+  // modify the request, pause the request or cancel the request. This will
+  // take ownership of the NavigationThrottle.
+  // Note: in non-test cases, NavigationThrottles should not be added directly
+  // but returned by the implementation of
+  // ContentBrowserClient::AddNavigationThrottles. This ensures proper ordering
+  // of the throttles.
+  virtual void RegisterThrottleForTesting(
+      scoped_ptr<NavigationThrottle> navigation_throttle) = 0;
 };
 
 }  // namespace content