Support persistent incognito preferences

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

Index: chrome/test/data/extensions/api_test/content_settings/incognito/test.html
diff --git a/chrome/test/data/extensions/api_test/content_settings/incognito/test.html b/chrome/test/data/extensions/api_test/content_settings/incognito/test.html
index ab3b65393bcc357f6d80e78475a26e2f7bec8514..b16f8c0907e2a7833269b2ff1cf95307e364a3e6 100644
--- a/chrome/test/data/extensions/api_test/content_settings/incognito/test.html
+++ b/chrome/test/data/extensions/api_test/content_settings/incognito/test.html
@@ -25,11 +25,10 @@ chrome.test.runTests([
                  'levelOfControl': "ControllableByThisExtension" },
                "third-party cookies should not be blocked in incognito mode"));
   },
-  // TODO(battre): re-enable when incognito preferences are available again.
-  /*
   function set() {
     cs.misc.blockThirdPartyCookies.set(
-        { 'incognito': true, 'value': true }, chrome.test.callbackPass());
+        { 'scope': 'incognito_persistent', 'value': true },
+        chrome.test.callbackPass());
   },
   function getRegular2() {
     cs.misc.blockThirdPartyCookies.get(
@@ -46,6 +45,5 @@ chrome.test.runTests([
                  'levelOfControl': "ControlledByThisExtension" },
                "third-party cookies should be blocked in incognito mode"));
   },
-  */
 ]);
 </script>