Add a NavigationThrottle to the public content/ interface

content/browser/loader/navigation_resource_handler.cc

 // Copyright 2014 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/loader/navigation_resource_handler.h"
 
 #include "base/logging.h"
 #include "content/browser/devtools/devtools_netlog_observer.h"
 #include "content/browser/loader/navigation_url_loader_impl_core.h"
 #include "content/browser/loader/resource_request_info_impl.h"
 #include "content/browser/resource_context_impl.h"
 #include "content/browser/streams/stream.h"
 #include "content/browser/streams/stream_context.h"
 #include "content/public/browser/resource_controller.h"
 #include "content/public/browser/stream_handle.h"
 #include "content/public/common/resource_response.h"
 #include "net/base/net_errors.h"
+#include "net/url_request/redirect_info.h"
 #include "net/url_request/url_request.h"
+#include "net/url_request/url_request_context.h"
+#include "net/url_request/url_request_job_factory.h"
 
 namespace content {
 
 NavigationResourceHandler::NavigationResourceHandler(
     net::URLRequest* request,
     NavigationURLLoaderImplCore* core)
     : ResourceHandler(request),
       core_(core) {
   core_->set_resource_handler(this);
   writer_.set_immediate_mode(true);
@@ skipping 26 matching lines @@
 
 bool NavigationResourceHandler::OnRequestRedirected(
     const net::RedirectInfo& redirect_info,
     ResourceResponse* response,
     bool* defer) {
   DCHECK(core_);
 
   // TODO(davidben): Perform a CSP check here, and anything else that would have
   // been done renderer-side.
   DevToolsNetLogObserver::PopulateResponseInfo(request(), response);
-  core_->NotifyRequestRedirected(redirect_info, response);
+  bool is_external_protocol =
+      !request()->context()->job_factory()->IsHandledURL(redirect_info.new_url);

[nasko, 2015/09/04 23:36:49]

Can some of those smaller bits, like propagating the is_external_protocol value
be split out in separate CLs? That way we have more manageable/smaller CLs.

[clamy, 2015/09/08 16:27:19]

I've taken out the is_external_protocol update part. It's only used for logging
on Android, so I'll see if I can get rid of it entirely.

+  core_->NotifyRequestRedirected(redirect_info, response, is_external_protocol);
   *defer = true;
   return true;
 }
 
 bool NavigationResourceHandler::OnResponseStarted(ResourceResponse* response,
                                                   bool* defer) {
   DCHECK(core_);
 
   ResourceRequestInfoImpl* info = GetRequestInfo();
 
@@ skipping 66 matching lines @@
   NOTREACHED();
 }
 
 void NavigationResourceHandler::DetachFromCore() {
   DCHECK(core_);
   core_->set_resource_handler(nullptr);
   core_ = nullptr;
 }
 
 }  // namespace content