Merge CrossSiteResourceHandler and NavigationResourceThrottle

content/browser/loader/DEPS

Index: content/browser/loader/DEPS
diff --git a/content/browser/loader/DEPS b/content/browser/loader/DEPS
index 9094b240a0c88b496ce54f1fdf2a773ed4ac3494..f1faf1b6503e99f97a027a44a052cc7b2d49a69e 100644
--- a/content/browser/loader/DEPS
+++ b/content/browser/loader/DEPS
@@ -339,5 +339,8 @@ specific_include_rules = {
     "+content/public/common/process_type.h",
     "+content/public/test/test_browser_context.h",
     "+content/public/test/test_browser_thread_bundle.h",
+
+    #TODO: To be removed.

[nasko, 2016/09/09 23:30:27]

Can you add a bit of context for this? Why/when this needs to be removed? What
is the reason it needs to be removed.

[clamy, 2016/09/12 15:31:37]

Added an explanation. The issue is that we have to use a test function for main
requests, but that will go away when PlzNavigate lands.

+    "+content/browser/loader/navigation_resource_throttle.h"
   ],
 }