Reland "Merge of CrossSiteResourceHandler and NavigationResourceThrottle."

content/browser/loader/resource_request_info_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/loader/resource_request_info_impl.h"
 
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/loader/global_routing_id.h"
 #include "content/browser/loader/resource_message_filter.h"
 #include "content/browser/web_contents/web_contents_impl.h"
@@ skipping 142 matching lines @@
     blink::WebReferrerPolicy referrer_policy,
     blink::WebPageVisibilityState visibility_state,
     ResourceContext* context,
     base::WeakPtr<ResourceMessageFilter> filter,
     bool report_raw_headers,
     bool is_async,
     bool is_using_lofi,
     const std::string& original_headers,
     const scoped_refptr<ResourceRequestBodyImpl> body,
     bool initiated_in_secure_context)
-    : cross_site_handler_(NULL),
-      detachable_handler_(NULL),
+    : detachable_handler_(NULL),
       process_type_(process_type),
       child_id_(child_id),
       route_id_(route_id),
       frame_tree_node_id_(frame_tree_node_id),
       origin_pid_(origin_pid),
       request_id_(request_id),
       render_frame_id_(render_frame_id),
       is_main_frame_(is_main_frame),
       parent_is_main_frame_(parent_is_main_frame),
       should_replace_current_entry_(should_replace_current_entry),
@@ skipping 171 matching lines @@
   origin_pid_ = origin_pid;
   request_id_ = request_id;
   filter_ = filter;
 }
 
 void ResourceRequestInfoImpl::ResetBody() {
   body_ = nullptr;
 }
 
 }  // namespace content