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 de370f3e9ef12df43738c8962144a90f0c85dc48..3612f6a6e5ce2c1ae09573299bdd42f14d5d6cfc 100644
--- a/chrome/browser/extensions/extension_content_settings_apitest.cc
+++ b/chrome/browser/extensions/extension_content_settings_apitest.cc
@@ -3,6 +3,8 @@
 // found in the LICENSE file.
 
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/content_settings/cookie_settings.h"
+#include "chrome/browser/content_settings/cookie_settings_factory.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"
@@ -21,12 +23,16 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentSettings) {
 
   HostContentSettingsMap* map =
       browser()->profile()->GetHostContentSettingsMap();
+  CookieSettings* cookie_settings =
+      CookieSettingsFactory::GetForProfile(browser()->profile());
 
   // 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->IsReadingCookieAllowed(
+      example_url, example_url));
+  EXPECT_TRUE(cookie_settings->IsSettingCookieAllowed(
+      example_url, example_url));
+  EXPECT_TRUE(cookie_settings->IsCookieSessionOnly(example_url));
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             map->GetContentSetting(example_url,
                                    example_url,
@@ -64,8 +70,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->IsReadingCookieAllowed(url, url));
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             map->GetContentSetting(
                 url, url, CONTENT_SETTINGS_TYPE_IMAGES, ""));