| Index: components/test_runner/test_runner.cc
|
| diff --git a/components/test_runner/test_runner.cc b/components/test_runner/test_runner.cc
|
| index 0b4792783a76db8a77643d477b6c39464f0505f7..463091213429da3f93d4da58b0fdda7d3af5e1be 100644
|
| --- a/components/test_runner/test_runner.cc
|
| +++ b/components/test_runner/test_runner.cc
|
| @@ -192,7 +192,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);
|
| @@ -483,8 +482,6 @@ gin::ObjectTemplateBuilder TestRunnerBindings::GetObjectTemplateBuilder(
|
| .SetMethod("sendBluetoothManualChooserEvent",
|
| &TestRunnerBindings::SendBluetoothManualChooserEvent)
|
| .SetMethod("setAcceptLanguages", &TestRunnerBindings::SetAcceptLanguages)
|
| - .SetMethod("setAllowDisplayOfInsecureContent",
|
| - &TestRunnerBindings::SetAllowDisplayOfInsecureContent)
|
| .SetMethod("setAllowFileAccessFromFileURLs",
|
| &TestRunnerBindings::SetAllowFileAccessFromFileURLs)
|
| .SetMethod("setAllowRunningOfInsecureContent",
|
| @@ -1127,11 +1124,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);
|
| @@ -2315,8 +2307,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") {
|
| @@ -2483,11 +2473,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();
|
|
|