HostContentSettingsMap refactoring.

chrome/browser/extensions/extension_content_settings_apitest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // 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"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "webkit/plugins/npapi/mock_plugin_list.h"
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentSettings) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableExperimentalExtensionApis);
 
   PrefService* pref_service = browser()->profile()->GetPrefs();
   pref_service->SetBoolean(prefs::kBlockThirdPartyCookies, true);
   pref_service->SetBoolean(prefs::kEnableReferrers, false);
 
   EXPECT_TRUE(RunExtensionTest("content_settings/standard")) << message_;
 
   const PrefService::Preference* pref = pref_service->FindPreference(
       prefs::kBlockThirdPartyCookies);
   ASSERT_TRUE(pref);
   EXPECT_TRUE(pref->IsExtensionControlled());
   EXPECT_FALSE(pref_service->GetBoolean(prefs::kBlockThirdPartyCookies));
   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,
                                    CONTENT_SETTINGS_TYPE_IMAGES,
                                    std::string()));
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             map->GetContentSetting(example_url,
                                    example_url,
                                    CONTENT_SETTINGS_TYPE_JAVASCRIPT,
                                    std::string()));
@@ skipping 17 matching lines @@
                                    std::string()));
 #endif
   EXPECT_EQ(CONTENT_SETTING_ASK,
             map->GetContentSetting(example_url,
                                    example_url,
                                    CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
                                    std::string()));
 
   // 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, ""));
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             map->GetContentSetting(
                 url, url, CONTENT_SETTINGS_TYPE_JAVASCRIPT, ""));
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             map->GetContentSetting(
                 url, url, CONTENT_SETTINGS_TYPE_PLUGINS, ""));
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
@@ skipping 126 matching lines @@
                             FilePath(kBarPath),
                             ASCIIToUTF16("2.3.4"),
                             ASCIIToUTF16("bar")));
   GetResourceIdentifiersFunction::SetPluginListForTesting(&plugin_list);
 
   EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers"))
       << message_;
 
   GetResourceIdentifiersFunction::SetPluginListForTesting(NULL);
 }