Merge CrossSiteResourceHandler and NavigationResourceThrottle

content/content_browser.gypi

 # 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.
 
 {
   'dependencies': [
     '../base/base.gyp:base_static',
     '../cc/cc.gyp:cc',
     '../cc/cc.gyp:cc_surfaces',
     '../components/components.gyp:display_compositor',
@@ skipping 739 matching lines @@
       'browser/fileapi/browser_file_system_helper.h',
       'browser/fileapi/fileapi_message_filter.cc',
       'browser/fileapi/fileapi_message_filter.h',
       'browser/fileapi/upload_file_system_file_element_reader.cc',
       'browser/fileapi/upload_file_system_file_element_reader.h',
       'browser/find_request_manager.cc',
       'browser/find_request_manager.h',
       'browser/font_list_async.cc',
       'browser/frame_host/cross_process_frame_connector.cc',
       'browser/frame_host/cross_process_frame_connector.h',
-      'browser/frame_host/cross_site_transferring_request.cc',
-      'browser/frame_host/cross_site_transferring_request.h',
       'browser/frame_host/debug_urls.cc',
       'browser/frame_host/debug_urls.h',
       'browser/frame_host/frame_navigation_entry.cc',
       'browser/frame_host/frame_navigation_entry.h',
       'browser/frame_host/frame_tree.cc',
       'browser/frame_host/frame_tree.h',
       'browser/frame_host/frame_tree_node.cc',
       'browser/frame_host/frame_tree_node.h',
       'browser/frame_host/frame_tree_node_blame_context.cc',
       'browser/frame_host/frame_tree_node_blame_context.h',
@@ skipping 145 matching lines @@
       'browser/indexed_db/leveldb/leveldb_write_batch.cc',
       'browser/indexed_db/leveldb/leveldb_write_batch.h',
       'browser/leveldb_wrapper_impl.cc',
       'browser/leveldb_wrapper_impl.h',
       'browser/loader/async_resource_handler.cc',
       'browser/loader/async_resource_handler.h',
       'browser/loader/async_revalidation_driver.cc',
       'browser/loader/async_revalidation_driver.h',
       'browser/loader/async_revalidation_manager.cc',
       'browser/loader/async_revalidation_manager.h',
-      'browser/loader/cross_site_resource_handler.cc',
-      'browser/loader/cross_site_resource_handler.h',
       'browser/loader/detachable_resource_handler.cc',
       'browser/loader/detachable_resource_handler.h',
       'browser/loader/global_routing_id.h',
       'browser/loader/layered_resource_handler.cc',
       'browser/loader/layered_resource_handler.h',
       'browser/loader/loader_delegate.h',
       'browser/loader/loader_io_thread_notifier.cc',
       'browser/loader/loader_io_thread_notifier.h',
       'browser/loader/mime_type_resource_handler.cc',
       'browser/loader/mime_type_resource_handler.h',
@@ skipping 1176 matching lines @@
       ],
     }],
     ['OS != "mac" and OS != "android"', {
       'sources!': [
         'browser/gpu/gpu_surface_tracker.cc',
         'browser/gpu/gpu_surface_tracker.h',
       ],
     }],
   ],
 }