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

Unified Diff: content/shell/renderer/layout_test/blink_test_helpers.cc

Issue 2278303002: Remove the allow-displaying-mixed-content setting from Blink. (Closed)
Patch Set: Fixed missign deprecated preference registration. Created 4 years, 3 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/renderer/layout_test/blink_test_helpers.cc
diff --git a/content/shell/renderer/layout_test/blink_test_helpers.cc b/content/shell/renderer/layout_test/blink_test_helpers.cc
index 376ba18b3fab8ba65478ff616cbfa0d250b40804..35626b17875ce4c6e401b11f55965c8a78b6d2ea 100644
--- a/content/shell/renderer/layout_test/blink_test_helpers.cc
+++ b/content/shell/renderer/layout_test/blink_test_helpers.cc
@@ -36,8 +36,6 @@ void ExportLayoutTestSpecificPreferences(
// experimentalCSSRegionsEnabled is deprecated and ignored.
to->hyperlink_auditing_enabled = from.hyperlink_auditing_enabled;
to->caret_browsing_enabled = from.caret_browsing_enabled;
- to->allow_displaying_insecure_content =
- from.allow_display_of_insecure_content;
to->allow_running_insecure_content = from.allow_running_of_insecure_content;
to->should_respect_image_orientation = from.should_respect_image_orientation;
to->allow_file_access_from_file_urls = from.allow_file_access_from_file_urls;
@@ -72,7 +70,6 @@ void ApplyLayoutTestDefaultPreferences(WebPreferences* prefs) {
prefs->application_cache_enabled = true;
prefs->tabs_to_links = false;
prefs->hyperlink_auditing_enabled = false;
- prefs->allow_displaying_insecure_content = true;
prefs->allow_running_insecure_content = false;
prefs->disable_reading_from_canvas = false;
prefs->strict_mixed_content_checking = false;
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | third_party/WebKit/LayoutTests/http/tests/fetch/resources/init.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698