summaryrefslogtreecommitdiffstats
path: root/chrome/browser/automation
diff options
context:
space:
mode:
authormarkusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-19 10:04:09 +0000
committermarkusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-19 10:04:09 +0000
commitac9c56f82dd5d10db9861c648f10612540011879 (patch)
tree958298073cd222dead2c6fbbd0844f50e8a22f8b /chrome/browser/automation
parenta30446a0dd47e52a46a6d448f1b2c0c615772982 (diff)
downloadchromium_src-ac9c56f82dd5d10db9861c648f10612540011879.zip
chromium_src-ac9c56f82dd5d10db9861c648f10612540011879.tar.gz
chromium_src-ac9c56f82dd5d10db9861c648f10612540011879.tar.bz2
Enable ContentSettingsPattern to match origins.
BUG=83200 TEST=content_settings_pattern_unittests.cc, content_settings_pattern_parser_unittests.cc Review URL: http://codereview.chromium.org/6820039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85894 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation')
-rw-r--r--chrome/browser/automation/testing_automation_provider.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 11b9063..574b54b 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -5825,7 +5825,7 @@ void TestingAutomationProvider::SetContentSetting(
if (host.empty()) {
map->SetDefaultContentSetting(content_type, setting);
} else {
- map->SetContentSetting(ContentSettingsPattern(host),
+ map->SetContentSetting(ContentSettingsPattern::FromString(host),
content_type, "", setting);
}
*success = true;