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 e85a1fb9a09a0ab5cf7fc7971823cd0ca6be59aa..a9685e347c700988dae5236040be4e5ade03b319 100644
--- a/content/browser/loader/navigation_resource_throttle.h
+++ b/content/browser/loader/navigation_resource_throttle.h
@@ -42,12 +42,23 @@ class NavigationResourceThrottle : public ResourceThrottle {
   CONTENT_EXPORT static void set_ui_checks_always_succeed_for_testing(
       bool ui_checks_always_succeed);
 
+  // Used in unit tests to make all navigations transfer.
+  CONTENT_EXPORT static void set_force_transfer_for_testing(
+      bool force_transfer);
+
  private:
   void OnUIChecksPerformed(NavigationThrottle::ThrottleCheckResult result);
 
+  // Used in transfer navigations.
+  void InitiateTransfer();
+  void OnTransferComplete();
+
   net::URLRequest* request_;
   ResourceDispatcherHostDelegate* resource_dispatcher_host_delegate_;
   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);