Revert "FrameHost::SubresourceResponseStarted: s/ url / origin_of_final_url /."
This CL reverts r716451 (also minimally/partially reverting r724034 as
required). The revert is needed because r716451 caused every blob load
(blobs see no certificate errors) to call RevokeUserAllowExceptions.
Bug: 1049625, 973885
Tbr: Nasko Oskov <[email protected]>
Tbr: Charlie Harrison <[email protected]>
Tbr: Alex Ilin <[email protected]>
No-Tree-Checks: true
Change-Id: Ie592ae6bc79820eea2230244f0abd890e279be4d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2047355
Commit-Queue: John Budorick <[email protected]>
Reviewed-by: Alex Moshchuk <[email protected]>
Cr-Commit-Position: refs/heads/master@{#740011}
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 975a63c..2ffa3da7 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4476,7 +4476,7 @@
if (navigation_handle->IsInMainFrame() &&
navigation_handle->GetNetErrorCode() == net::OK) {
controller_.ssl_manager()->DidStartResourceResponse(
- url::Origin::Create(navigation_handle->GetURL()),
+ navigation_handle->GetURL(),
navigation_handle->GetSSLInfo().has_value()
? net::IsCertStatusError(
navigation_handle->GetSSLInfo()->cert_status)
@@ -4830,11 +4830,9 @@
// AddNewContents method call.
}
-void WebContentsImpl::SubresourceResponseStarted(
- const url::Origin& origin_of_final_response_url,
- net::CertStatus cert_status) {
- controller_.ssl_manager()->DidStartResourceResponse(
- origin_of_final_response_url, cert_status);
+void WebContentsImpl::SubresourceResponseStarted(const GURL& url,
+ net::CertStatus cert_status) {
+ controller_.ssl_manager()->DidStartResourceResponse(url, cert_status);
SetNotWaitingForResponse();
}
