Index: content/browser/web_contents/web_contents_impl.cc |
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc |
index 7c02ea952f1947a89bcb3bb6ccf7665ba9b45549..5d36488377fa7a2ad08cd9c63575d375a31e2b10 100644 |
--- a/content/browser/web_contents/web_contents_impl.cc |
+++ b/content/browser/web_contents/web_contents_impl.cc |
@@ -3538,6 +3538,12 @@ void WebContentsImpl::OnDidLoadResourceFromMemoryCache( |
void WebContentsImpl::OnDidDisplayInsecureContent(RenderFrameHostImpl* source) { |
// Any frame can trigger display of insecure content, so we don't check |
// |source| here. |
+ DidDisplayInsecureContent(); |
+} |
+ |
+void WebContentsImpl::DidDisplayInsecureContent() { |
+ // Note: this implementation is an equivalent of |
+ // ContentSettingsObserver::allowDisplayingInsecureContent |
RecordAction(base::UserMetricsAction("SSL.DisplayedInsecureContent")); |
controller_.ssl_manager()->DidDisplayMixedContent(); |
} |
@@ -3548,6 +3554,11 @@ void WebContentsImpl::OnDidRunInsecureContent(RenderFrameHostImpl* source, |
// TODO(nick, estark): Should we call FilterURL using |source|'s process on |
// these parameters? |target_url| seems unused, except for a log message. And |
// |security_origin| might be replaceable with the origin of the main frame. |
+ DidRunInsecureContent(security_origin, target_url); |
+} |
+ |
+void WebContentsImpl::DidRunInsecureContent(const GURL& security_origin, |
+ const GURL& target_url) { |
LOG(WARNING) << security_origin << " ran insecure content from " |
<< target_url.possibly_invalid_spec(); |
RecordAction(base::UserMetricsAction("SSL.RanInsecureContent")); |