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

Unified Diff: components/test_runner/test_runner.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
« no previous file with comments | « components/test_runner/test_runner.h ('k') | content/public/common/common_param_traits_macros.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/test_runner/test_runner.cc
diff --git a/components/test_runner/test_runner.cc b/components/test_runner/test_runner.cc
index d684316db47eb4d336a3f798342f01e96a2999f0..80162a192c626628a2b091ef94fb155bf999039f 100644
--- a/components/test_runner/test_runner.cc
+++ b/components/test_runner/test_runner.cc
@@ -191,7 +191,6 @@ class TestRunnerBindings : public gin::Wrappable<TestRunnerBindings> {
void SendBluetoothManualChooserEvent(const std::string& event,
const std::string& argument);
void SetAcceptLanguages(const std::string& accept_languages);
- void SetAllowDisplayOfInsecureContent(bool allowed);
void SetAllowFileAccessFromFileURLs(bool allow);
void SetAllowRunningOfInsecureContent(bool allowed);
void SetAutoplayAllowed(bool allowed);
@@ -481,8 +480,6 @@ gin::ObjectTemplateBuilder TestRunnerBindings::GetObjectTemplateBuilder(
.SetMethod("sendBluetoothManualChooserEvent",
&TestRunnerBindings::SendBluetoothManualChooserEvent)
.SetMethod("setAcceptLanguages", &TestRunnerBindings::SetAcceptLanguages)
- .SetMethod("setAllowDisplayOfInsecureContent",
- &TestRunnerBindings::SetAllowDisplayOfInsecureContent)
.SetMethod("setAllowFileAccessFromFileURLs",
&TestRunnerBindings::SetAllowFileAccessFromFileURLs)
.SetMethod("setAllowRunningOfInsecureContent",
@@ -1132,11 +1129,6 @@ void TestRunnerBindings::SetPluginsAllowed(bool allowed) {
runner_->SetPluginsAllowed(allowed);
}
-void TestRunnerBindings::SetAllowDisplayOfInsecureContent(bool allowed) {
- if (runner_)
- runner_->SetAllowDisplayOfInsecureContent(allowed);
-}
-
void TestRunnerBindings::SetAllowRunningOfInsecureContent(bool allowed) {
if (runner_)
runner_->SetAllowRunningOfInsecureContent(allowed);
@@ -2313,8 +2305,6 @@ void TestRunner::OverridePreference(const std::string& key,
prefs->hyperlink_auditing_enabled = value->BooleanValue();
} else if (key == "WebKitEnableCaretBrowsing") {
prefs->caret_browsing_enabled = value->BooleanValue();
- } else if (key == "WebKitAllowDisplayingInsecureContent") {
- prefs->allow_display_of_insecure_content = value->BooleanValue();
} else if (key == "WebKitAllowRunningInsecureContent") {
prefs->allow_running_of_insecure_content = value->BooleanValue();
} else if (key == "WebKitDisableReadingFromCanvas") {
@@ -2481,11 +2471,6 @@ void TestRunner::SetPluginsAllowed(bool allowed) {
OnLayoutTestRuntimeFlagsChanged();
}
-void TestRunner::SetAllowDisplayOfInsecureContent(bool allowed) {
- layout_test_runtime_flags_.set_displaying_insecure_content_allowed(allowed);
- OnLayoutTestRuntimeFlagsChanged();
-}
-
void TestRunner::SetAllowRunningOfInsecureContent(bool allowed) {
layout_test_runtime_flags_.set_running_insecure_content_allowed(allowed);
OnLayoutTestRuntimeFlagsChanged();
« no previous file with comments | « components/test_runner/test_runner.h ('k') | content/public/common/common_param_traits_macros.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698