diff options
| author | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-16 21:21:19 +0000 |
|---|---|---|
| committer | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-16 21:21:19 +0000 |
| commit | 3d5c8589c346c44381fa84121d1dc6cfc047d02c (patch) | |
| tree | c60636461399c08dbbb74f1f4cc37fdc258fb3f1 /chrome/browser/cookies_tree_model_unittest.cc | |
| parent | 1c8434ac77a77a11363ddd2806e7e5723036429a (diff) | |
| download | chromium_src-3d5c8589c346c44381fa84121d1dc6cfc047d02c.zip chromium_src-3d5c8589c346c44381fa84121d1dc6cfc047d02c.tar.gz chromium_src-3d5c8589c346c44381fa84121d1dc6cfc047d02c.tar.bz2 | |
Add methods to support item_pattern, top_level_frame_pattersn to host_content_settings_map and
migrate single pattern preferences.
BUG=YYY
TEST=host_content_setttings_map_unittest.cc, content_settings_pref_provider_unittest.cc
Review URL: http://codereview.chromium.org/6982038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cookies_tree_model_unittest.cc')
| -rw-r--r-- | chrome/browser/cookies_tree_model_unittest.cc | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/chrome/browser/cookies_tree_model_unittest.cc b/chrome/browser/cookies_tree_model_unittest.cc index e80b326..f97e9d4 100644 --- a/chrome/browser/cookies_tree_model_unittest.cc +++ b/chrome/browser/cookies_tree_model_unittest.cc @@ -841,8 +841,6 @@ TEST_F(CookiesTreeModelTest, OriginOrdering) { TEST_F(CookiesTreeModelTest, ContentSettings) { GURL host("http://example.com/"); - ContentSettingsPattern pattern = - ContentSettingsPattern::FromString("[*.]example.com"); net::CookieMonster* monster = profile_->GetCookieMonster(); monster->SetCookie(host, "A=1"); @@ -867,13 +865,20 @@ TEST_F(CookiesTreeModelTest, ContentSettings) { EXPECT_EQ(1, origin->child_count()); EXPECT_TRUE(origin->CanCreateContentException()); EXPECT_CALL(observer, - OnContentSettingsChanged(content_settings, - CONTENT_SETTINGS_TYPE_COOKIES, false, - _, false)); + OnContentSettingsChanged( + content_settings, + CONTENT_SETTINGS_TYPE_COOKIES, + false, + ContentSettingsPattern::FromURLNoWildcard(host), + ContentSettingsPattern::Wildcard(), + false)); EXPECT_CALL(observer, OnContentSettingsChanged(content_settings, - CONTENT_SETTINGS_TYPE_COOKIES, false, - pattern, false)); + CONTENT_SETTINGS_TYPE_COOKIES, + false, + ContentSettingsPattern::FromURL(host), + ContentSettingsPattern::Wildcard(), + false)); origin->CreateContentException( content_settings, CONTENT_SETTING_SESSION_ONLY); EXPECT_EQ(CONTENT_SETTING_SESSION_ONLY, |