Refactor ResourceHandler API.

content/browser/loader/DEPS

Index: content/browser/loader/DEPS
diff --git a/content/browser/loader/DEPS b/content/browser/loader/DEPS
index 00241732fbc95a462d6da35cc3b838d8917c8b6f..a8a7ad54e7169b87205ba72dc5b67449678dad2a 100644
--- a/content/browser/loader/DEPS
+++ b/content/browser/loader/DEPS
@@ -81,6 +81,7 @@ specific_include_rules = {
   "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",
   ],
@@ -111,6 +112,7 @@ specific_include_rules = {
     "+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",
@@ -148,6 +150,7 @@ specific_include_rules = {
     "+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",
@@ -224,6 +227,8 @@ specific_include_rules = {
   ],
   "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",
@@ -286,6 +291,7 @@ specific_include_rules = {
   ],
   "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",
@@ -300,9 +306,9 @@ specific_include_rules = {
   ],
   "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",
 
@@ -323,6 +329,7 @@ specific_include_rules = {
   "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",