Index: content/browser/loader/resource_loader.cc |
diff --git a/content/browser/loader/resource_loader.cc b/content/browser/loader/resource_loader.cc |
index 273c4d8023890a30889b1cb3999a5760e8aa6d71..e05e09733e90914690a40ac1052987f88c78f5fb 100644 |
--- a/content/browser/loader/resource_loader.cc |
+++ b/content/browser/loader/resource_loader.cc |
@@ -163,11 +163,6 @@ ResourceLoader::~ResourceLoader() { |
} |
void ResourceLoader::StartRequest() { |
- if (delegate_->HandleExternalProtocol(this, request_->url())) { |
- CancelAndIgnore(); |
- return; |
- } |
- |
// Give the handler a chance to delay the URLRequest from being started. |
bool defer_start = false; |
if (!handler_->OnWillStart(request_->url(), &defer_start)) { |
@@ -175,6 +170,11 @@ void ResourceLoader::StartRequest() { |
return; |
} |
+ if (delegate_->HandleExternalProtocol(this, request_->url())) { |
+ CancelAndIgnore(); |
+ return; |
+ } |
+ |
carlosk
2016/07/18 14:37:13
This order change was necessary to allow mixed-con
clamy
2016/07/18 15:20:37
This seems wrong. The mixed content_check will not
carlosk
2016/07/19 13:31:01
Thanks for pointing that out. My latest patch shou
|
TRACE_EVENT_WITH_FLOW0("loading", "ResourceLoader::StartRequest", this, |
TRACE_EVENT_FLAG_FLOW_OUT); |
if (defer_start) { |