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 4eadb25f11536515d5593a37e3bdd16fdc3f5942..158a80f7e06259833ff002dcd1f1a0f8fad2fcda 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",
   ],
@@ -110,6 +111,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",
@@ -145,6 +147,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",
@@ -220,6 +223,8 @@ specific_include_rules = {
   ],
   "resource_handler\.(cc|h)": [
     "-content",
+    "+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/common/content_export.h",
@@ -280,9 +285,9 @@ 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",
     "+content/public/common/resource_type.h",
 
     # TODO: these all have to be removed.
@@ -294,9 +299,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",
 
@@ -317,6 +322,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",