diff options
author | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-09 13:24:00 +0000 |
---|---|---|
committer | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-09 13:24:00 +0000 |
commit | 00ecc283a232890bb13cbd15b5d433642b3e5810 (patch) | |
tree | 677f817d0b6825b1464e113c8d6f78ec8215e9b4 /chrome/browser/ui/content_settings | |
parent | d7e2ee9d0388412ebee3867a3727f7bcc742cbd9 (diff) | |
download | chromium_src-00ecc283a232890bb13cbd15b5d433642b3e5810.zip chromium_src-00ecc283a232890bb13cbd15b5d433642b3e5810.tar.gz chromium_src-00ecc283a232890bb13cbd15b5d433642b3e5810.tar.bz2 |
In memory map to store |Value| objects for
(origin pattern, origin pattern, content type, resource) identifier) tuples.
This is supposed to replace the content_settings::BaseProvider.
BUG=63656
TEST=origin_identifier_value_map_unittest.cc,
content_settings_pref_provider_unittest.cc,
host_content_settings_map_unittest.cc
Review URL: http://codereview.chromium.org/7049007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88522 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/content_settings')
-rw-r--r-- | chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc index 1320096..fcf5818 100644 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc @@ -111,6 +111,10 @@ TEST_F(ContentSettingBubbleModelTest, MultiplePlugins) { HostContentSettingsMap* map = profile_->GetHostContentSettingsMap(); std::string fooPlugin = "foo"; std::string barPlugin = "bar"; + + // Navigating to some sample url prevents the GetURL method from returning an + // invalid empty URL. + contents()->NavigateAndCommit(GURL("http://www.example.com")); GURL url = contents()->GetURL(); map->AddExceptionForURL(url, CONTENT_SETTINGS_TYPE_PLUGINS, |