HostContentSettingsMap refactoring.

chrome/browser/cookies_tree_model_unittest.cc

Index: chrome/browser/cookies_tree_model_unittest.cc
diff --git a/chrome/browser/cookies_tree_model_unittest.cc b/chrome/browser/cookies_tree_model_unittest.cc
index 65cb895d95bde98389bb36a4b52d2b98561d46ee..fc08f08437fcd71db0aa2fe72fa176f412d8e253 100644
--- a/chrome/browser/cookies_tree_model_unittest.cc
+++ b/chrome/browser/cookies_tree_model_unittest.cc
@@ -6,6 +6,7 @@
 
 #include <string>
 
+#include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/mock_settings_observer.h"
 #include "chrome/browser/mock_browsing_data_appcache_helper.h"
@@ -948,6 +949,8 @@ TEST_F(CookiesTreeModelTest, ContentSettings) {
   TestingProfile profile;
   HostContentSettingsMap* content_settings =
       profile.GetHostContentSettingsMap();
+  CookieSettings* cookie_settings =
+      CookieSettings::GetForProfile(&profile);
   MockSettingsObserver observer;
 
   CookieTreeRootNode* root =
@@ -965,16 +968,33 @@ TEST_F(CookiesTreeModelTest, ContentSettings) {
                   ContentSettingsPattern::Wildcard(),
                   false));
   EXPECT_CALL(observer,
-              OnContentSettingsChanged(content_settings,
+              OnContentSettingsChanged(
+                  content_settings,
                   CONTENT_SETTINGS_TYPE_COOKIES,
                   false,
                   ContentSettingsPattern::FromURL(host),
                   ContentSettingsPattern::Wildcard(),
                   false));
+  EXPECT_CALL(observer,
+              OnContentSettingsChanged(
+                  content_settings,
+                  CONTENT_SETTINGS_TYPE_COOKIES_SESSION_ONLY,
+                  false,
+                  ContentSettingsPattern::FromURLNoWildcard(host),
+                  ContentSettingsPattern::Wildcard(),
+                  false));
+  EXPECT_CALL(observer,
+              OnContentSettingsChanged(
+                  content_settings,
+                  CONTENT_SETTINGS_TYPE_COOKIES_SESSION_ONLY,
+                  false,
+                  ContentSettingsPattern::FromURL(host),
+                  ContentSettingsPattern::Wildcard(),
+                  false));
   origin->CreateContentException(
-      content_settings, CONTENT_SETTING_SESSION_ONLY);
-  EXPECT_EQ(CONTENT_SETTING_SESSION_ONLY,
-      content_settings->GetCookieContentSetting(host, host, true));
+      cookie_settings, CONTENT_SETTING_SESSION_ONLY);
+  EXPECT_TRUE(cookie_settings->IsSettingCookieAllowed(host, host));
+  EXPECT_TRUE(cookie_settings->IsCookieSessionOnly(host));
 }
 
 TEST_F(CookiesTreeModelTest, FileSystemFilter) {