HostContentSettingsMap refactoring.

chrome/browser/extensions/extension_content_settings_apitest.cc

Index: chrome/browser/extensions/extension_content_settings_apitest.cc
diff --git a/chrome/browser/extensions/extension_content_settings_apitest.cc b/chrome/browser/extensions/extension_content_settings_apitest.cc
index ee3b2ccb3f5b24f64478be42dc9514ec57bffe5b..c9ee3936fa7572100f993344834c79cb7404d21a 100644
--- a/chrome/browser/extensions/extension_content_settings_apitest.cc
+++ b/chrome/browser/extensions/extension_content_settings_apitest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_content_settings_api.h"
@@ -31,12 +32,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentSettings) {
   EXPECT_TRUE(pref_service->GetBoolean(prefs::kEnableReferrers));
   HostContentSettingsMap* map =
       browser()->profile()->GetHostContentSettingsMap();
+  CookieSettings* cookie_settings = map->GetCookieSettings();
 
   // Check default content settings by using an unknown URL.
   GURL example_url("http://www.example.com");
-  EXPECT_EQ(CONTENT_SETTING_SESSION_ONLY,
-            map->GetCookieContentSetting(
-                example_url, example_url, false));
+  EXPECT_TRUE(cookie_settings->IsCookieAllowed(
+      example_url, example_url, false));
+  EXPECT_TRUE(cookie_settings->IsCookieSessionOnly(example_url));
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             map->GetContentSetting(example_url,
                                    example_url,
@@ -74,8 +76,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentSettings) {
 
   // Check content settings for www.google.com
   GURL url("http://www.google.com");
-  EXPECT_EQ(CONTENT_SETTING_BLOCK,
-            map->GetCookieContentSetting(url, url, false));
+  EXPECT_FALSE(cookie_settings->IsCookieAllowed(url, url, false));
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             map->GetContentSetting(
                 url, url, CONTENT_SETTINGS_TYPE_IMAGES, ""));