| Index: chrome/browser/renderer_host/intercept_navigation_resource_throttle.cc
|
| diff --git a/chrome/browser/renderer_host/intercept_navigation_resource_throttle.cc b/chrome/browser/renderer_host/intercept_navigation_resource_throttle.cc
|
| index 674aa5502be29a0c2d76d87ee6050b516a01a263..c911d0f3518347baaa97e0f6a8fc556c55f4497a 100644
|
| --- a/chrome/browser/renderer_host/intercept_navigation_resource_throttle.cc
|
| +++ b/chrome/browser/renderer_host/intercept_navigation_resource_throttle.cc
|
| @@ -10,9 +10,8 @@
|
| #include "content/public/browser/render_process_host.h"
|
| #include "content/public/browser/resource_request_info.h"
|
| #include "content/public/browser/resource_controller.h"
|
| -#include "content/public/browser/web_contents.h"
|
| -#include "content/public/browser/web_contents_delegate.h"
|
| #include "content/public/common/referrer.h"
|
| +#include "net/base/net_errors.h"
|
| #include "net/url_request/url_request.h"
|
|
|
| using content::BrowserThread;
|
| @@ -20,8 +19,6 @@ using content::ChildProcessSecurityPolicy;
|
| using content::Referrer;
|
| using content::RenderViewHost;
|
| using content::ResourceRequestInfo;
|
| -using content::WebContents;
|
| -using content::WebContentsDelegate;
|
|
|
| namespace {
|
|
|
| @@ -118,9 +115,7 @@ void InterceptNavigationResourceThrottle::OnResultObtained(
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
|
|
| if (should_ignore_navigation) {
|
| - // TODO(mkosiba): Cancel() results in a CANCELLED status but what we really
|
| - // want is a HANDLED_EXTERNALLY status.
|
| - controller()->Cancel();
|
| + controller()->CancelWithError(net::OK_HANDLED_EXTERNALLY);
|
| } else {
|
| controller()->Resume();
|
| }
|
|
|