Merge CrossSiteResourceHandler and NavigationResourceThrottle

content/browser/devtools/render_frame_devtools_agent_host.cc

Index: content/browser/devtools/render_frame_devtools_agent_host.cc
diff --git a/content/browser/devtools/render_frame_devtools_agent_host.cc b/content/browser/devtools/render_frame_devtools_agent_host.cc
index d55be9332960e615fff19a921da7e285e6ffdad2..acfa56f43f529e203f49bd245e65da0338b67eb1 100644
--- a/content/browser/devtools/render_frame_devtools_agent_host.cc
+++ b/content/browser/devtools/render_frame_devtools_agent_host.cc
@@ -562,8 +562,8 @@ RenderFrameDevToolsAgentHost::~RenderFrameDevToolsAgentHost() {
 
 void RenderFrameDevToolsAgentHost::ReadyToCommitNavigation(
     NavigationHandle* navigation_handle) {
-  // ReadyToCommitNavigation should only be called in PlzNavigate.
-  DCHECK(IsBrowserSideNavigationEnabled());
+  if (!IsBrowserSideNavigationEnabled())

[Charlie Reis, 2016/09/16 21:19:25]

I'm a bit surprised by this, since one motivation of the CL is to get
ReadyToCommitNavigation to work in all modes.  I agree that this avoids tacking
additional changes onto this CL, but will this code eventually want to handle
ReadyToCommitNavigation in non-PlzNavigate mode?  If so, let's add a TODO to
make the intention clear.

[clamy, 2016/09/20 15:57:21]

Done.

+    return;
 
   // If the navigation is not tracked, return;
   if (navigating_handles_.count(navigation_handle) == 0)