Introduce a CookieSettings for incognito mode

chrome/browser/content_settings/cookie_settings.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.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 56 matching lines @@
 void CookieSettings::Factory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kBlockThirdPartyCookies,
       false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 }
 
 content::BrowserContext* CookieSettings::Factory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
-  return chrome::GetBrowserContextRedirectedInIncognito(context);
+  // The incognito profile has its own content settings map. Therefore, it
+  // should get its own CookieSettings.
+  return chrome::GetBrowserContextOwnInstanceInIncognito(context);
 }
 
 scoped_refptr<RefcountedKeyedService>
 CookieSettings::Factory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   Profile* profile = static_cast<Profile*>(context);
   return new CookieSettings(profile->GetHostContentSettingsMap(),
                             profile->GetPrefs());
 }
 
@@ skipping 134 matching lines @@
 
   base::AutoLock auto_lock(lock_);
   block_third_party_cookies_ = pref_change_registrar_.prefs()->GetBoolean(
       prefs::kBlockThirdPartyCookies);
 }
 
 bool CookieSettings::ShouldBlockThirdPartyCookies() const {
   base::AutoLock auto_lock(lock_);
   return block_third_party_cookies_;
 }