Adding Navigation Throttles to DevTools

content/browser/frame_host/navigation_handle_impl.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/frame_host/navigation_handle_impl.h"
 
 #include <utility>
 
 #include "base/logging.h"
+#include "content/browser/devtools/render_frame_devtools_agent_host.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/browser/frame_host/navigator_delegate.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
 #include "content/common/frame_messages.h"
 #include "content/common/resource_request_body_impl.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/common/content_client.h"
 #include "net/url_request/redirect_info.h"
@@ skipping 300 matching lines @@
   transition_ = transition;
   is_external_protocol_ = is_external_protocol;
 
   state_ = WILL_SEND_REQUEST;
   complete_callback_ = callback;
 
   // Register the navigation throttles. The ScopedVector returned by
   // GetNavigationThrottles is not assigned to throttles_ directly because it
   // would overwrite any throttle previously added with
   // RegisterThrottleForTesting.
   ScopedVector<NavigationThrottle> throttles_to_register =

[clamy, 2016/07/08 15:47:33]

Considering that we're now adding more than one throttle, I'd prefer if this
were put in a specific method.

[alex clarke (OOO till 29th), 2016/07/08 17:15:40]

I'm not 100% sure if I've done what you had in mind. I've pulled this whole
section out into it's own function.

       GetContentClient()->browser()->CreateThrottlesForNavigation(this);
   if (throttles_to_register.size() > 0) {
     throttles_.insert(throttles_.end(), throttles_to_register.begin(),
                       throttles_to_register.end());
     throttles_to_register.weak_clear();
   }
+  std::unique_ptr<NavigationThrottle> devtools_throttle =
+      RenderFrameDevToolsAgentHost::GetThrottleForNavigation(this);
+  if (devtools_throttle)
+    throttles_.push_back(devtools_throttle.release());
 
   // Notify each throttle of the request.
   NavigationThrottle::ThrottleCheckResult result = CheckWillStartRequest();
 
   // If the navigation is not deferred, run the callback.
   if (result != NavigationThrottle::DEFER)
     RunCompleteCallback(result);
 }
 
 void NavigationHandleImpl::WillRedirectRequest(
@@ skipping 180 matching lines @@
   complete_callback_.Reset();
 
   if (!callback.is_null())
     callback.Run(result);
 
   // No code after running the callback, as it might have resulted in our
   // destruction.
 }
 
 }  // namespace content