Support persistent incognito preferences

chrome/test/data/extensions/api_test/content_settings/onchange/test.html

Index: chrome/test/data/extensions/api_test/content_settings/onchange/test.html
diff --git a/chrome/test/data/extensions/api_test/content_settings/onchange/test.html b/chrome/test/data/extensions/api_test/content_settings/onchange/test.html
index 7cfff1fd5a32b685d5efd631338a28f32617cef2..9e940ccf3e5abbcc31d184a18ee76e80ba77f02e 100644
--- a/chrome/test/data/extensions/api_test/content_settings/onchange/test.html
+++ b/chrome/test/data/extensions/api_test/content_settings/onchange/test.html
@@ -35,8 +35,6 @@ chrome.test.runTests([
       'value':true
     }, chrome.test.callbackPass());
   },
-  // TODO(battre): re-enable when incognito is available again.
-  /*
   function changeIncognitoOnly() {
     listenUntil(cs.misc.blockThirdPartyCookies.onChange, [{
       'value': false,
@@ -45,10 +43,9 @@ chrome.test.runTests([
     }]);
     cs.misc.blockThirdPartyCookies.set({
       'value': false,
-      'incognito': true
+      'scope': 'incognito_persistent'
     }, chrome.test.callbackPass());
   },
-  */
   function changeDefaultOnly() {
     listenUntil(cs.misc.blockThirdPartyCookies.onChange, [{
       'value': false,
@@ -58,8 +55,6 @@ chrome.test.runTests([
       'value': false
     }, chrome.test.callbackPass());
   },
-  // TODO(battre): re-enable when incognito is available again.
-  /*
   function changeIncognitoOnlyBack() {
     // Change the incognito setting back to true so that we get an event when
     // clearing the value.
@@ -70,7 +65,7 @@ chrome.test.runTests([
     }]);
     cs.misc.blockThirdPartyCookies.set({
       'value': true,
-      'incognito': true
+      'scope': 'incognito_persistent'
     }, chrome.test.callbackPass());
   },
   function clearIncognito() {
@@ -80,10 +75,9 @@ chrome.test.runTests([
       'levelOfControl': 'ControlledByThisExtension'
     }]);
     cs.misc.blockThirdPartyCookies.clear({
-      'incognito': true
+      'scope': 'incognito_persistent'
     }, chrome.test.callbackPass());
   },
-  */
   function clearDefault() {
     listenUntil(cs.misc.blockThirdPartyCookies.onChange, [{
       'value': false,