Support persistent incognito preferences

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 "chrome/browser/extensions/extension_apitest.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"
@@ skipping 22 matching lines @@
 
   PrefService* prefs = browser()->profile()->GetPrefs();
   prefs->SetBoolean(prefs::kBlockThirdPartyCookies, false);
 
   EXPECT_TRUE(RunExtensionTestIncognito("content_settings/incognito")) <<
       message_;
 
   // Setting an incognito preference should not create an incognito profile.
   EXPECT_FALSE(browser()->profile()->HasOffTheRecordProfile());
 
-  // TODO(battre): re-enable when incognito is available again.
-#if 0
   PrefService* otr_prefs =
       browser()->profile()->GetOffTheRecordProfile()->GetPrefs();
   const PrefService::Preference* pref =
       otr_prefs->FindPreference(prefs::kBlockThirdPartyCookies);
   ASSERT_TRUE(pref);
   EXPECT_TRUE(pref->IsExtensionControlled());
   EXPECT_TRUE(otr_prefs->GetBoolean(prefs::kBlockThirdPartyCookies));
 
   pref = prefs->FindPreference(prefs::kBlockThirdPartyCookies);
   ASSERT_TRUE(pref);
   EXPECT_FALSE(pref->IsExtensionControlled());
   EXPECT_FALSE(prefs->GetBoolean(prefs::kBlockThirdPartyCookies));
-#endif
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoDisabledContentSettings) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableExperimentalExtensionApis);
 
   EXPECT_FALSE(RunExtensionTest("content_settings/incognito"));
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentSettingsClear) {
@@ skipping 15 matching lines @@
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentSettingsOnChange) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableExperimentalExtensionApis);
 
   PrefService* prefs = browser()->profile()->GetPrefs();
   prefs->SetBoolean(prefs::kBlockThirdPartyCookies, false);
 
   EXPECT_TRUE(RunExtensionTestIncognito("content_settings/onchange")) <<
       message_;
 }