Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1602)

Unified Diff: content/shell/browser/layout_test/layout_test_content_browser_client.cc

Issue 1905033002: PlzNavigate: Move navigation-level mixed content checks to the browser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@console-security-message
Patch Set: Overall code cleanup to request reviewers to PTAL. Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/shell/browser/layout_test/layout_test_content_browser_client.cc
diff --git a/content/shell/browser/layout_test/layout_test_content_browser_client.cc b/content/shell/browser/layout_test/layout_test_content_browser_client.cc
index 25425570f0e9857587af895059060156d6912554..cc183ce7f418c5a8edf7e04a535a9f32fbcb828c 100644
--- a/content/shell/browser/layout_test/layout_test_content_browser_client.cc
+++ b/content/shell/browser/layout_test/layout_test_content_browser_client.cc
@@ -125,4 +125,35 @@ LayoutTestContentBrowserClient::GetPlatformNotificationService() {
return layout_test_notification_manager_.get();
}
+bool LayoutTestContentBrowserClient::ShouldAllowDisplayingInsecureContent(
+ bool allowed_per_settings,
+ const GURL& resource_url,
+ content::WebContents* web_contents) {
+ const base::DictionaryValue& test_flags =
+ BlinkTestController::Get()
+ ->accumulated_layout_test_runtime_flags_changes();
+ bool allow_displaying = false;
+ test_flags.GetBoolean("displaying_insecure_content_allowed",
+ &allow_displaying);
+ // Displaying is also allowed when running is allowed.
+ bool allow_running = false;
+ test_flags.GetBoolean("running_insecure_content_allowed", &allow_running);
+
+ return allowed_per_settings || allow_displaying || allow_running;
+}
+
+bool LayoutTestContentBrowserClient::ShouldAllowRunningInsecureContent(
+ bool allowed_per_settings,
+ const url::Origin& origin,
+ const GURL& resource_url,
+ content::WebContents* web_contents) {
+ const base::DictionaryValue& test_flags =
+ BlinkTestController::Get()
+ ->accumulated_layout_test_runtime_flags_changes();
+ bool allow_running = false;
+ test_flags.GetBoolean("running_insecure_content_allowed", &allow_running);
+
+ return allowed_per_settings || allow_running;
+}
+
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698