| Index: components/test_runner/mock_content_settings_client.cc
|
| diff --git a/components/test_runner/mock_content_settings_client.cc b/components/test_runner/mock_content_settings_client.cc
|
| index 4aa8c004314369c97fbb3bb83afc25a86a9ba37a..0ac3f2ae7158df0660b340ece7a898b056c7bcb7 100644
|
| --- a/components/test_runner/mock_content_settings_client.cc
|
| +++ b/components/test_runner/mock_content_settings_client.cc
|
| @@ -39,20 +39,24 @@ bool MockContentSettingsClient::allowMedia(const blink::WebURL& image_url) {
|
| return allowed;
|
| }
|
|
|
| +bool MockContentSettingsClient::allowScript(bool enabled_per_settings) {
|
| + return enabled_per_settings && flags_->scripts_allowed();
|
| +}
|
| +
|
| bool MockContentSettingsClient::allowScriptFromSource(
|
| bool enabled_per_settings,
|
| - const blink::WebURL& scriptURL) {
|
| + const blink::WebURL& script_url) {
|
| bool allowed = enabled_per_settings && flags_->scripts_allowed();
|
| if (flags_->dump_web_content_settings_client_callbacks() && delegate_) {
|
| delegate_->PrintMessage(
|
| std::string("MockContentSettingsClient: allowScriptFromSource(") +
|
| - NormalizeLayoutTestURL(scriptURL.string().utf8()) + "): " +
|
| + NormalizeLayoutTestURL(script_url.string().utf8()) + "): " +
|
| (allowed ? "true" : "false") + "\n");
|
| }
|
| return allowed;
|
| }
|
|
|
| -bool MockContentSettingsClient::allowStorage(bool) {
|
| +bool MockContentSettingsClient::allowStorage(bool enabled_per_settings) {
|
| return flags_->storage_allowed();
|
| }
|
|
|
| @@ -62,19 +66,19 @@ bool MockContentSettingsClient::allowPlugins(bool enabled_per_settings) {
|
|
|
| bool MockContentSettingsClient::allowDisplayingInsecureContent(
|
| bool enabled_per_settings,
|
| - const blink::WebURL&) {
|
| + const blink::WebURL& url) {
|
| return enabled_per_settings || flags_->displaying_insecure_content_allowed();
|
| }
|
|
|
| bool MockContentSettingsClient::allowRunningInsecureContent(
|
| bool enabled_per_settings,
|
| - const blink::WebSecurityOrigin&,
|
| - const blink::WebURL&) {
|
| + const blink::WebSecurityOrigin& context,
|
| + const blink::WebURL& url) {
|
| return enabled_per_settings || flags_->running_insecure_content_allowed();
|
| }
|
|
|
| -bool MockContentSettingsClient::allowAutoplay(bool defaultValue) {
|
| - return defaultValue || flags_->autoplay_allowed();
|
| +bool MockContentSettingsClient::allowAutoplay(bool default_value) {
|
| + return default_value || flags_->autoplay_allowed();
|
| }
|
|
|
| void MockContentSettingsClient::SetDelegate(WebTestDelegate* delegate) {
|
|
|