diff options
| author | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 10:16:47 +0000 |
|---|---|---|
| committer | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 10:16:47 +0000 |
| commit | 472643af74d6a6f0efd541234217e22d4b2cc720 (patch) | |
| tree | 52da12b3b6515a56fadd5fe2e761e893c85dd30b /chrome/browser/automation | |
| parent | ac9c56f82dd5d10db9861c648f10612540011879 (diff) | |
| download | chromium_src-472643af74d6a6f0efd541234217e22d4b2cc720.zip chromium_src-472643af74d6a6f0efd541234217e22d4b2cc720.tar.gz chromium_src-472643af74d6a6f0efd541234217e22d4b2cc720.tar.bz2 | |
Revert 85894 - 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
TBR=markusheintz@chromium.org
Review URL: http://codereview.chromium.org/7049003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85895 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation')
| -rw-r--r-- | chrome/browser/automation/testing_automation_provider.cc | 2 |
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 574b54b..11b9063 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::FromString(host), + map->SetContentSetting(ContentSettingsPattern(host), content_type, "", setting); } *success = true; |