Support persistent incognito preferences

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

 <script>
 // Content settings API test
 // Run with browser_tests --gtest_filter=ExtensionApiTest.ContentSettingsOnChange
 
 // Listen until |event| has fired with all of the values in |expected|.
 function listenUntil(event, expected) {
   var done = chrome.test.listenForever(event, function(value) {
     for (var i = 0; i < expected.length; i++) {
       if (chrome.test.checkDeepEq(expected[i], value)) {
         expected.splice(i, 1);
@@ skipping 17 matching lines @@
     },
     {
       'value': true,
       'incognitoSpecific': false,
       'levelOfControl': 'ControlledByThisExtension'
     }]);
     cs.misc.blockThirdPartyCookies.set({
       'value':true
     }, chrome.test.callbackPass());
   },
-  // TODO(battre): re-enable when incognito is available again.
-  /*
   function changeIncognitoOnly() {
     listenUntil(cs.misc.blockThirdPartyCookies.onChangeEffective, [{
       'value': false,
       'incognitoSpecific': true,
       'levelOfControl': 'ControlledByThisExtension'
     }]);
     cs.misc.blockThirdPartyCookies.set({
       'value': false,
-      'incognito': true
+      'scope': 'incognito_persistent'
     }, chrome.test.callbackPass());
   },
-  */
   function changeDefaultOnly() {
     listenUntil(cs.misc.blockThirdPartyCookies.onChangeEffective, [{
       'value': false,
       'levelOfControl': 'ControlledByThisExtension'
     }]);
     cs.misc.blockThirdPartyCookies.set({
       '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.
     listenUntil(cs.misc.blockThirdPartyCookies.onChangeEffective, [{
       'value': true,
       'incognitoSpecific': true,
       'levelOfControl': 'ControlledByThisExtension'
     }]);
     cs.misc.blockThirdPartyCookies.set({
       'value': true,
-      'incognito': true
+      'scope': 'incognito_persistent'
     }, chrome.test.callbackPass());
   },
   function clearIncognito() {
     listenUntil(cs.misc.blockThirdPartyCookies.onChangeEffective, [{
       'value': false,
       'incognitoSpecific': false,
       'levelOfControl': 'ControlledByThisExtension'
     }]);
     cs.misc.blockThirdPartyCookies.clear({
-      'incognito': true
+      'scope': 'incognito_persistent'
     }, chrome.test.callbackPass());
   },
-  */
   function clearDefault() {
     listenUntil(cs.misc.blockThirdPartyCookies.onChangeEffective, [{
       'value': false,
       'levelOfControl': 'ControllableByThisExtension'
     },
     {
       'value': false,
       'incognitoSpecific': false,
       'levelOfControl': 'ControllableByThisExtension'
     }]);
     cs.misc.blockThirdPartyCookies.clear({}, chrome.test.callbackPass());
   }
 ]);
 
 </script>