Adding CookieSettings for storing cookie content settings.

chrome/browser/ui/webui/collected_cookies_ui_delegate.cc

Index: chrome/browser/ui/webui/collected_cookies_ui_delegate.cc
diff --git a/chrome/browser/ui/webui/collected_cookies_ui_delegate.cc b/chrome/browser/ui/webui/collected_cookies_ui_delegate.cc
index 36636fb74017a590faec0311e0e4a72fc9897850..b7a21a0436a48160584ae4a1bcc8c05329d6feb4 100644
--- a/chrome/browser/ui/webui/collected_cookies_ui_delegate.cc
+++ b/chrome/browser/ui/webui/collected_cookies_ui_delegate.cc
@@ -9,9 +9,10 @@
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/values.h"
-#include "chrome/browser/content_settings/host_content_settings_map.h"
+#include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/cookies_tree_model.h"
+#include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
@@ -19,6 +20,7 @@
 #include "chrome/browser/ui/webui/cookies_tree_model_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/jstemplate_builder.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_source.h"
@@ -156,8 +158,7 @@ CollectedCookiesUIDelegate::CollectedCookiesUIDelegate(
     : wrapper_(wrapper),
       closed_(false) {
   TabSpecificContentSettings* content_settings = wrapper->content_settings();
-  HostContentSettingsMap* host_content_settings_map =
-      wrapper->profile()->GetHostContentSettingsMap();
+  PrefService* prefs = wrapper->profile()->GetPrefs();
 
   registrar_.Add(this, chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN,
                  content::Source<TabSpecificContentSettings>(content_settings));
@@ -168,7 +169,7 @@ CollectedCookiesUIDelegate::CollectedCookiesUIDelegate(
       content_settings->GetBlockedCookiesTreeModel());
 
   CollectedCookiesSource* source = new CollectedCookiesSource(
-      host_content_settings_map->BlockThirdPartyCookies());
+      prefs->GetBoolean(prefs::kBlockThirdPartyCookies));
   wrapper->profile()->GetChromeURLDataManager()->AddDataSource(source);
 }
 
@@ -243,7 +244,7 @@ void CollectedCookiesUIDelegate::AddContentException(
     CookieTreeOriginNode* origin_node, ContentSetting setting) {
   if (origin_node->CanCreateContentException()) {
     Profile* profile = wrapper_->profile();
-    origin_node->CreateContentException(profile->GetHostContentSettingsMap(),
+    origin_node->CreateContentException(CookieSettings::GetForProfile(profile),
                                         setting);
 
     SetInfobarLabel(GetInfobarLabel(setting, origin_node->GetTitle()));