Removed Profile::GetHostContentSettingsMap

chrome/browser/content_settings/cookie_settings_factory.cc

 // Copyright (c) 2012 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 "chrome/browser/content_settings/cookie_settings_factory.h"
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/content_settings/core/browser/cookie_settings.h"
 #include "components/content_settings/core/common/pref_names.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/user_metrics.h"
 #include "extensions/common/constants.h"
 
 using base::UserMetricsAction;
 
 // static
 scoped_refptr<content_settings::CookieSettings>
 CookieSettingsFactory::GetForProfile(Profile* profile) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   return static_cast<content_settings::CookieSettings*>(
       GetInstance()->GetServiceForBrowserContext(profile, true).get());
 }
 
 // static
 CookieSettingsFactory* CookieSettingsFactory::GetInstance() {
   return base::Singleton<CookieSettingsFactory>::get();
 }
 
 CookieSettingsFactory::CookieSettingsFactory()
     : RefcountedBrowserContextKeyedServiceFactory(
           "CookieSettings",
           BrowserContextDependencyManager::GetInstance()) {
+  DependsOn(HostContentSettingsMapFactory::GetInstance());
 }
 
 CookieSettingsFactory::~CookieSettingsFactory() {
 }
 
 void CookieSettingsFactory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   content_settings::CookieSettings::RegisterProfilePrefs(registry);
 }
 
 content::BrowserContext* CookieSettingsFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   // The incognito profile has its own content settings map. Therefore, it
   // should get its own CookieSettings.
   return chrome::GetBrowserContextOwnInstanceInIncognito(context);
 }
 
 scoped_refptr<RefcountedKeyedService>
 CookieSettingsFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   Profile* profile = static_cast<Profile*>(context);
   if (profile->GetPrefs()->GetBoolean(prefs::kBlockThirdPartyCookies)) {
     content::RecordAction(UserMetricsAction("ThirdPartyCookieBlockingEnabled"));
   } else {
     content::RecordAction(
         UserMetricsAction("ThirdPartyCookieBlockingDisabled"));
   }
   return new content_settings::CookieSettings(
-      profile->GetHostContentSettingsMap(), profile->GetPrefs(),
+      HostContentSettingsMapFactory::GetForProfile(profile),
+      profile->GetPrefs(),
       extensions::kExtensionScheme);
 }