Disable setting incognito prefs for extensions for now.

BUG=60099
TEST=no

Review URL: http://codereview.chromium.org/6990054

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86666 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 18 insertions, 8 deletions

diff --git a/chrome/browser/extensions/extension_content_settings_apitest.cc b/chrome/browser/extensions/extension_content_settings_apitest.cc
index f16fdff..db3d481 100644
--- a/chrome/browser/extensions/extension_content_settings_apitest.cc
+++ b/chrome/browser/extensions/extension_content_settings_apitest.cc
@@ -40,6 +40,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoContentSettings) {
   // 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 =
@@ -52,6 +54,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoContentSettings) {
   ASSERT_TRUE(pref);
   EXPECT_FALSE(pref->IsExtensionControlled());
   EXPECT_FALSE(prefs->GetBoolean(prefs::kBlockThirdPartyCookies));
+#endif
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoDisabledContentSettings) {
diff --git a/chrome/browser/extensions/extension_preference_api.cc b/chrome/browser/extensions/extension_preference_api.cc
index 48b40e6..a45e5b6 100644
--- a/chrome/browser/extensions/extension_preference_api.cc
+++ b/chrome/browser/extensions/extension_preference_api.cc
@@ -38,7 +38,8 @@ const char kIncognitoSpecific[] = "incognitoSpecific";
 const char kLevelOfControl[] = "levelOfControl";
 const char kValue[] = "value";
 
-const char kOnPrefChangeFormat[] = "experimental.preferences.%s.onChange";
+const char kOnPrefChangeFormat[] =
+    "experimental.preferences.%s.onChange";
 
 const char kIncognitoErrorMessage[] =
     "You do not have permission to access incognito preferences.";
@@ -346,8 +347,10 @@ bool SetPreferenceFunction::RunImpl() {
   EXTENSION_FUNCTION_VALIDATE(details->Get(kValue, &value));
 
   bool incognito = false;
-  if (details->HasKey(kIncognito))
-    EXTENSION_FUNCTION_VALIDATE(details->GetBoolean(kIncognito, &incognito));
+
+  // TODO(battre): enable incognito preferences again.
+  // if (details->HasKey(kIncognito))
+  //   EXTENSION_FUNCTION_VALIDATE(details->GetBoolean(kIncognito, &incognito));
 
   if (incognito && !include_incognito()) {
     error_ = kIncognitoErrorMessage;
@@ -395,8 +398,10 @@ bool ClearPreferenceFunction::RunImpl() {
   EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &details));
 
   bool incognito = false;
-  if (details->HasKey(kIncognito))
-    EXTENSION_FUNCTION_VALIDATE(details->GetBoolean(kIncognito, &incognito));
+
+  // TODO(battre): enable incognito preferences again.
+  // if (details->HasKey(kIncognito))
+  //   EXTENSION_FUNCTION_VALIDATE(details->GetBoolean(kIncognito, &incognito));
 
   // We don't check incognito permissions here, as an extension should be always
   // allowed to clear its own settings.
diff --git a/chrome/browser/extensions/extension_proxy_apitest.cc b/chrome/browser/extensions/extension_proxy_apitest.cc
index 174be30..364fa31 100644
--- a/chrome/browser/extensions/extension_proxy_apitest.cc
+++ b/chrome/browser/extensions/extension_proxy_apitest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -190,8 +190,9 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyFixedIndividual) {
 }
 
 // Tests setting values only for incognito mode
+// TODO(battre): re-enable when incognito is supported again
 IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest,
-    ProxyFixedIndividualIncognitoOnly) {
+    DISABLED_ProxyFixedIndividualIncognitoOnly) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableExperimentalExtensionApis);
 
@@ -216,8 +217,9 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest,
 }
 
 // Tests setting values also for incognito mode
+// TODO(battre): re-enable when incognito is supported again
 IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest,
-    ProxyFixedIndividualIncognitoAlso) {
+    DISABLED_ProxyFixedIndividualIncognitoAlso) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableExperimentalExtensionApis);