Merge CrossSiteResourceHandler and NavigationResourceThrottle

content/browser/loader/navigation_resource_throttle.h

Index: content/browser/loader/navigation_resource_throttle.h
diff --git a/content/browser/loader/navigation_resource_throttle.h b/content/browser/loader/navigation_resource_throttle.h
index 74dfe7936f6f5dbaba9d859eda7bb66c793ff123..be15fd3196603cfb1d66f140f8be6bd349e4e7e3 100644
--- a/content/browser/loader/navigation_resource_throttle.h
+++ b/content/browser/loader/navigation_resource_throttle.h
@@ -7,6 +7,7 @@
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
+#include "content/common/content_export.h"
 #include "content/public/browser/navigation_throttle.h"
 #include "content/public/browser/resource_throttle.h"
 #include "content/public/common/request_context_type.h"
@@ -38,13 +39,29 @@ class NavigationResourceThrottle : public ResourceThrottle {
   void WillProcessResponse(bool* defer) override;
   const char* GetNameForLogging() const override;
 
+  // Used in unit tests to make UI checks pass when they would fail due to no
+  // NavigationHandle being present in the RenderFrameHost.
+  CONTENT_EXPORT static void SetUIChecksAlwaysSuccedForTesting(
+      bool ui_checks_always_succeed);
+
+  // Used in unit tests to make all navigations transfer.
+  CONTENT_EXPORT static void SetForceTransferForTesting(
+      bool force_transfer);
+
  private:
   void OnUIChecksPerformed(NavigationThrottle::ThrottleCheckResult result);
 
+  // Used in transfer navigations.
+  void InitiateTransfer();
+  void OnTransferDone();

[nasko, 2016/09/08 23:45:39]

nit: OnTransferComplete?

[clamy, 2016/09/09 15:06:41]

Done.

+
   net::URLRequest* request_;
   ResourceDispatcherHostDelegate* resource_dispatcher_host_delegate_;
   CertStore* cert_store_;
   RequestContextType request_context_type_;
+  bool in_cross_site_transition_;
+  NavigationThrottle::ThrottleCheckResult on_transfer_done_result_;
+
   base::WeakPtrFactory<NavigationResourceThrottle> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationResourceThrottle);