Reland "Merge of CrossSiteResourceHandler and NavigationResourceThrottle."

content/browser/loader/resource_request_info_impl.h

Index: content/browser/loader/resource_request_info_impl.h
diff --git a/content/browser/loader/resource_request_info_impl.h b/content/browser/loader/resource_request_info_impl.h
index 356efa4cf8a0bf1d52944c9f15393d0a551f72ee..b51527796335388270c2db555be21267d4a4c332 100644
--- a/content/browser/loader/resource_request_info_impl.h
+++ b/content/browser/loader/resource_request_info_impl.h
@@ -21,7 +21,6 @@
 #include "net/base/load_states.h"
 
 namespace content {
-class CrossSiteResourceHandler;
 class DetachableResourceHandler;
 class ResourceContext;
 class ResourceMessageFilter;
@@ -125,14 +124,6 @@ class ResourceRequestInfoImpl : public ResourceRequestInfo,
                          int request_id,
                          base::WeakPtr<ResourceMessageFilter> filter);
 
-  // CrossSiteResourceHandler for this request.  May be null.
-  CrossSiteResourceHandler* cross_site_handler() {
-    return cross_site_handler_;
-  }
-  void set_cross_site_handler(CrossSiteResourceHandler* h) {
-    cross_site_handler_ = h;
-  }
-
   // Whether this request is part of a navigation that should replace the
   // current session history entry. This state is shuffled up and down the stack
   // for request transfers.
@@ -211,7 +202,6 @@ class ResourceRequestInfoImpl : public ResourceRequestInfo,
   FRIEND_TEST_ALL_PREFIXES(ResourceDispatcherHostTest,
                            DeletedFilterDetachedRedirect);
   // Non-owning, may be NULL.
-  CrossSiteResourceHandler* cross_site_handler_;
   DetachableResourceHandler* detachable_handler_;
 
   int process_type_;