Refactor ResourceHandler API.

content/browser/loader/DEPS

 # The core loading code in this directory is being transitioned into a separate
 # Mojo networking service. See http://crbug.com/598073. The first stage is to
 # decouple the code that will be moved from the rest of content. These rules
 # help ensure that we don't add more includes, and can progressively reduce the
 # code's dependencies.
 #
 # For each file, the first section shows includes that are allowed (i.e. because
 # they are for files that will be moving as well). The second section, separated
 # by a comment, lists files that we will have to decouple.
 specific_include_rules = {
@@ skipping 63 matching lines @@
     "-content",
     "+content/browser/loader/resource_buffer.h",
     "+content/common/content_export.h",
   ],
   "global_routing_id\.h": [
     "-content",
   ],
   "layered_resource_handler\.(cc|h)": [
     "-content",
     "+content/browser/loader/layered_resource_handler.h",
+    "+content/browser/loader/resource_controller.h",
     "+content/browser/loader/resource_handler.h",
     "+content/common/content_export.h",
   ],
   "mojo_async_resource_handler\.(cc|h)": [
     "-content",
     "+content/browser/loader/async_resource_handler.h",
     "+content/browser/loader/downloaded_temp_file_impl.h",
     "+content/browser/loader/mojo_async_resource_handler.h",
     "+content/browser/loader/netlog_observer.h",
     "+content/browser/loader/resource_controller.h",
@@ skipping 10 matching lines @@
     "+content/public/common/resource_type.h",
   ],
   "mojo_async_resource_handler_unittest\.cc": [
     "-content",
     "+content/browser/loader/mock_resource_loader.h",
     "+content/browser/loader/mojo_async_resource_handler.h",
     "+content/browser/loader/test_url_loader_client.h",
     "+content/browser/loader/resource_controller.h",
     "+content/browser/loader/resource_dispatcher_host_impl.h",
     "+content/browser/loader/resource_request_info_impl.h",
+    "+content/browser/loader/test_resource_handler_wrapper.h",
     "+content/common/resource_request.h",
     "+content/common/resource_request_completion_status.h",
     "+content/common/url_loader.mojom.h",
     "+content/public/browser/appcache_service.h",
     "+content/public/browser/navigation_data.h",
     "+content/public/browser/resource_context.h",
     "+content/public/browser/resource_dispatcher_host_delegate.h",
     "+content/public/browser/resource_throttle.h",
     "+content/public/browser/stream_info.h",
     "+content/public/common/previews_state.h",
@@ skipping 17 matching lines @@
     "+content/browser/loader/power_save_block_resource_throttle.h",
     "+content/public/browser/resource_throttle.h",
   ],
   "resource_dispatcher_host_impl\.(cc|h)": [
     "-content",
     "+content/browser/loader/async_resource_handler.h",
     "+content/browser/loader/async_revalidation_manager.h",
     "+content/browser/loader/global_routing_id.h",
     "+content/browser/loader/loader_delegate.h",
     "+content/browser/loader/mojo_async_resource_handler.h",
+    "+content/browser/loader/null_resource_controller.h",
     "+content/browser/loader/power_save_block_resource_throttle.h",
     "+content/browser/loader/resource_dispatcher_host_impl.h",
     "+content/browser/loader/resource_loader.h",
     "+content/browser/loader/resource_loader_delegate.h",
     "+content/browser/loader/resource_message_filter.h",
     "+content/browser/loader/resource_request_info_impl.h",
     "+content/browser/loader/resource_requester_info.h",
     "+content/browser/loader/resource_scheduler.h",
     "+content/browser/loader/stream_resource_handler.h",
     "+content/browser/loader/sync_resource_handler.h",
@@ skipping 56 matching lines @@
     "+content/public/common/resource_type.h",
 
     # TODO: To be replaced by mojo.
     "+content/common/resource_messages.h",
     "+content/common/resource_request.h",
     "+content/common/resource_request_completion_status.h",
     "+content/common/view_messages.h",
   ],
   "resource_handler\.(cc|h)": [
     "-content",
+    "+content/browser/loader/resource_controller.h",
+    "+content/browser/loader/resource_dispatcher_host_impl.h",

[Charlie Harrison, 2017/01/25 20:22:59]

How is this a DEP?

[mmenke, 2017/01/25 22:07:58]

Done.  (An earlier draft had OOB removal going through it, instead of the
ResourceHandler::Delegate approach I use now).

     "+content/browser/loader/resource_handler.h",
     "+content/browser/loader/resource_request_info_impl.h",
     "+content/common/content_export.h",
   ],
   "resource_loader\.(cc|h)": [
     "-content",
     "+content/browser/loader/resource_controller.h",
     "+content/browser/loader/resource_handler.h",
     "+content/browser/loader/resource_loader.h",
     "+content/browser/loader/resource_loader_delegate.h",
@@ skipping 42 matching lines @@
     "+content/browser/web_contents/web_contents_impl.h",
     "+content/common/net/url_request_service_worker_data.h",
     "+content/common/net/url_request_user_data.h",
     "+content/public/browser/browser_thread.h",
     "+content/public/browser/navigation_ui_data.h",
     "+content/public/common/browser_side_navigation_policy.h",
     "+content/public/common/process_type.h",
   ],
   "resource_requester_info\.(cc|h)": [
     "-content",
+    "+content/browser/loader/resource_controller.h",
     "+content/browser/loader/resource_requester_info.h",
     "+content/common/content_export.h",
     "+content/public/browser/resource_context.h",
     "+content/public/common/resource_type.h",
 
     # TODO: these all have to be removed.
     "+content/browser/appcache/chrome_appcache_service.h",
     "+content/browser/blob_storage/chrome_blob_storage_context.h",
     "+content/browser/service_worker/service_worker_context_wrapper.h",
     "+content/public/browser/browser_thread.h",
     "+content/public/common/browser_side_navigation_policy.h",
   ],
   "resource_scheduler\.(cc|h)": [
     "-content",
+    "+content/browser/loader/resource_controller.h",
     "+content/browser/loader/resource_scheduler.h",
     "+content/common/content_export.h",
-    "+content/public/browser/resource_controller.h",
     "+content/public/browser/resource_request_info.h",
     "+content/public/browser/resource_throttle.h",
 
     # TODO: To be replaced by mojo.
     "+content/common/resource_messages.h",
   ],
   "resource_scheduler_filter\.(cc|h)": [
     "-content",
     "+content/browser/loader/resource_dispatcher_host_impl.h",
     "+content/browser/loader/resource_scheduler.h",
     "+content/browser/loader/resource_scheduler_filter.h",
 
     # TODO: To be replaced by mojo.
     "+content/common/frame_messages.h",
     "+content/common/view_messages.h",
     "+content/public/browser/browser_message_filter.h",
   ],
   "sync_resource_handler\.(cc|h)": [
     "-content",
     "+content/browser/loader/netlog_observer.h",
+    "+content/browser/loader/resource_controller.h",
     "+content/browser/loader/resource_dispatcher_host_impl.h",
     "+content/browser/loader/resource_handler.h",
     "+content/browser/loader/resource_request_info_impl.h",
     "+content/browser/loader/sync_resource_handler.h",
     "+content/public/browser/resource_dispatcher_host_delegate.h",
     "+content/public/browser/resource_request_info.h",
     "+content/public/common/resource_response.h",
 
 
     # TODO: To be replaced by mojo.
@@ skipping 40 matching lines @@
     "+content/public/browser/resource_context.h",
     "+content/public/browser/resource_dispatcher_host_delegate.h",
     "+content/public/common/content_paths.h",
     "+content/public/test/test_browser_context.h",
     "+content/public/test/test_browser_thread_bundle.h",
 
     #TODO: To be removed when PlzNavigate lands.
     "+content/browser/loader/navigation_resource_throttle.h"
   ],
 }