Extension API: Rename contentSettings.misc to .global and rename preferences under it.

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

Index: chrome/test/data/extensions/api_test/content_settings/session_only_incognito/test.html
diff --git a/chrome/test/data/extensions/api_test/content_settings/session_only_incognito/test.html b/chrome/test/data/extensions/api_test/content_settings/session_only_incognito/test.html
index ee77a28ed4a7f18276d0295a6373e16300bb685a..accf7d8e88e8509e681e9c3fec22e279e476b624 100644
--- a/chrome/test/data/extensions/api_test/content_settings/session_only_incognito/test.html
+++ b/chrome/test/data/extensions/api_test/content_settings/session_only_incognito/test.html
@@ -11,36 +11,36 @@ function expect(expected, message) {
 }
 chrome.test.runTests([
   function getRegular() {
-    cs.misc.blockThirdPartyCookies.get(
+    cs.global.thirdPartyCookiesAllowed.get(
         {},
-        expect({ 'value': false,
+        expect({ 'value': true,
                  'levelOfControl': "controllable_by_this_extension" },
                "third-party cookies should not be blocked"));
   },
   function getIncognito() {
-    cs.misc.blockThirdPartyCookies.get(
+    cs.global.thirdPartyCookiesAllowed.get(
         { 'incognito': true },
-        expect({ 'value': false,
+        expect({ 'value': true,
                  'incognitoSpecific': false,
                  'levelOfControl': "controllable_by_this_extension" },
                "third-party cookies should not be blocked in incognito mode"));
   },
   function set() {
-    cs.misc.blockThirdPartyCookies.set(
-        { 'scope': 'incognito_persistent', 'value': true },
+    cs.global.thirdPartyCookiesAllowed.set(
+        { 'scope': 'incognito_persistent', 'value': false },
         chrome.test.callbackPass());
   },
   function getRegular2() {
-    cs.misc.blockThirdPartyCookies.get(
+    cs.global.thirdPartyCookiesAllowed.get(
         {},
-        expect({ 'value': false,
+        expect({ 'value': true,
                  'levelOfControl': "controllable_by_this_extension" },
                "third-party cookies should not be blocked"));
   },
   function getIncognito2() {
-    cs.misc.blockThirdPartyCookies.get(
+    cs.global.thirdPartyCookiesAllowed.get(
         { 'incognito': true },
-        expect({ 'value': true,
+        expect({ 'value': false,
                  'incognitoSpecific': true,
                  'levelOfControl': "controlled_by_this_extension" },
                "third-party cookies should be blocked in incognito mode"));
@@ -48,8 +48,8 @@ chrome.test.runTests([
   // We cannot set session_only_persistent preferences if there is no incognito
   // session.
   function set2() {
-    cs.misc.blockThirdPartyCookies.set(
-        { 'scope': 'incognito_session_only', 'value': false },
+    cs.global.thirdPartyCookiesAllowed.set(
+        { 'scope': 'incognito_session_only', 'value': true },
         chrome.test.callbackFail("You cannot set a preference with scope " +
                                  "'incognito_session_only' when no incognito " +
                                  "window is open."));
@@ -59,21 +59,21 @@ chrome.test.runTests([
   },
   // session_only_persistent overrides incognito_persistent.
   function set3() {
-    cs.misc.blockThirdPartyCookies.set(
-        { 'scope': 'incognito_session_only', 'value': false },
+    cs.global.thirdPartyCookiesAllowed.set(
+        { 'scope': 'incognito_session_only', 'value': true },
         chrome.test.callbackPass());
   },
   function getRegular3() {
-    cs.misc.blockThirdPartyCookies.get(
+    cs.global.thirdPartyCookiesAllowed.get(
         {},
-        expect({ 'value': false,
+        expect({ 'value': true,
                  'levelOfControl': "controllable_by_this_extension" },
                "third-party cookies should not be blocked"));
   },
   function getIncognito3() {
-    cs.misc.blockThirdPartyCookies.get(
+    cs.global.thirdPartyCookiesAllowed.get(
         { 'incognito': true },
-        expect({ 'value': false,
+        expect({ 'value': true,
                  'incognitoSpecific': true,
                  'levelOfControl': "controlled_by_this_extension" },
                "third-party cookies should be blocked in incognito mode"));