Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1011)

Unified Diff: chrome/browser/content_settings/cookie_settings_factory_unittest.cc

Issue 2655443003: Unify the "get" and "set" cookie access settings. (Closed)
Patch Set: rebase Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/content_settings/cookie_settings_factory_unittest.cc
diff --git a/chrome/browser/content_settings/cookie_settings_factory_unittest.cc b/chrome/browser/content_settings/cookie_settings_factory_unittest.cc
index a9cbafa9ebfff39bd5c361ffaf850554c2d5fc72..c97835dc72df3186f5a8465e428b1298919c7572 100644
--- a/chrome/browser/content_settings/cookie_settings_factory_unittest.cc
+++ b/chrome/browser/content_settings/cookie_settings_factory_unittest.cc
@@ -45,16 +45,16 @@ TEST_F(CookieSettingsFactoryTest, IncognitoBehaviorOfBlockingRules) {
// The modification should apply to the regular profile and incognito profile.
EXPECT_FALSE(
- cookie_settings_->IsReadingCookieAllowed(kBlockedSite, kBlockedSite));
+ cookie_settings_->IsCookieAccessAllowed(kBlockedSite, kBlockedSite));
EXPECT_FALSE(
- incognito_settings->IsReadingCookieAllowed(kBlockedSite, kBlockedSite));
+ incognito_settings->IsCookieAccessAllowed(kBlockedSite, kBlockedSite));
// Modify an incognito cookie setting and check that this does not propagate
// into regular mode.
incognito_settings->SetCookieSetting(kHttpsSite, CONTENT_SETTING_BLOCK);
- EXPECT_TRUE(cookie_settings_->IsReadingCookieAllowed(kHttpsSite, kHttpsSite));
+ EXPECT_TRUE(cookie_settings_->IsCookieAccessAllowed(kHttpsSite, kHttpsSite));
EXPECT_FALSE(
- incognito_settings->IsReadingCookieAllowed(kHttpsSite, kHttpsSite));
+ incognito_settings->IsCookieAccessAllowed(kHttpsSite, kHttpsSite));
}
TEST_F(CookieSettingsFactoryTest, IncognitoBehaviorOfBlockingEverything) {
@@ -65,25 +65,25 @@ TEST_F(CookieSettingsFactoryTest, IncognitoBehaviorOfBlockingEverything) {
cookie_settings_->SetDefaultCookieSetting(CONTENT_SETTING_BLOCK);
// It should be effective for regular and incognito session.
- EXPECT_FALSE(cookie_settings_->IsReadingCookieAllowed(kFirstPartySite,
- kFirstPartySite));
- EXPECT_FALSE(incognito_settings->IsReadingCookieAllowed(kFirstPartySite,
- kFirstPartySite));
+ EXPECT_FALSE(cookie_settings_->IsCookieAccessAllowed(kFirstPartySite,
+ kFirstPartySite));
+ EXPECT_FALSE(incognito_settings->IsCookieAccessAllowed(kFirstPartySite,
+ kFirstPartySite));
// A whitelisted item set in incognito mode should only apply to incognito
// mode.
incognito_settings->SetCookieSetting(kAllowedSite, CONTENT_SETTING_ALLOW);
EXPECT_TRUE(
- incognito_settings->IsReadingCookieAllowed(kAllowedSite, kAllowedSite));
+ incognito_settings->IsCookieAccessAllowed(kAllowedSite, kAllowedSite));
EXPECT_FALSE(
- cookie_settings_->IsReadingCookieAllowed(kAllowedSite, kAllowedSite));
+ cookie_settings_->IsCookieAccessAllowed(kAllowedSite, kAllowedSite));
// A whitelisted item set in regular mode should apply to regular and
// incognito mode.
cookie_settings_->SetCookieSetting(kHttpsSite, CONTENT_SETTING_ALLOW);
EXPECT_TRUE(
- incognito_settings->IsReadingCookieAllowed(kHttpsSite, kHttpsSite));
- EXPECT_TRUE(cookie_settings_->IsReadingCookieAllowed(kHttpsSite, kHttpsSite));
+ incognito_settings->IsCookieAccessAllowed(kHttpsSite, kHttpsSite));
+ EXPECT_TRUE(cookie_settings_->IsCookieAccessAllowed(kHttpsSite, kHttpsSite));
}
} // namespace
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/content_settings/host_content_settings_map_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698