Unexperimentalify the cookies API.

BUG=41663,48726

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

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

6 files changed, 91 insertions, 61 deletions

diff --git a/chrome/test/data/extensions/api_test/cookies/api/manifest.json b/chrome/test/data/extensions/api_test/cookies/api/manifest.json
index 81ad918..fa14136 100644
--- a/chrome/test/data/extensions/api_test/cookies/api/manifest.json
+++ b/chrome/test/data/extensions/api_test/cookies/api/manifest.json
@@ -4,8 +4,8 @@
   "description": "end-to-end browser test for chrome.experimental.cookies API",
   "background_page": "background.html",
   "permissions": [
+    "cookies",
     "tabs",
-    "experimental",
     "http://*.chrome_extensions.cookies.com/",
     "http://chromium.cookies.com/",
     "https://*.cookies.com/",
diff --git a/chrome/test/data/extensions/api_test/cookies/api/tab.html b/chrome/test/data/extensions/api_test/cookies/api/tab.html
index 0d3eddee..f49376e 100644
--- a/chrome/test/data/extensions/api_test/cookies/api/tab.html
+++ b/chrome/test/data/extensions/api_test/cookies/api/tab.html
@@ -63,14 +63,14 @@ function expectNullCookie(cookie) {
 }
 
 function removeTestCookies() {
-  chrome.experimental.cookies.remove(
+  chrome.cookies.remove(
       {url: TEST_URL, name: TEST_BASIC_COOKIE.name});
-  chrome.experimental.cookies.remove(
+  chrome.cookies.remove(
       {url: TEST_URL, name: TEST_DOMAIN_COOKIE.name});
-  chrome.experimental.cookies.remove(
+  chrome.cookies.remove(
       {url: TEST_URL4, name: TEST_SECURE_COOKIE.name});
-  chrome.experimental.cookies.remove({url: TEST_URL, name: 'abcd'});
-  chrome.experimental.cookies.remove({url: TEST_ODD_URL, name: 'abcd'});
+  chrome.cookies.remove({url: TEST_URL, name: 'abcd'});
+  chrome.cookies.remove({url: TEST_ODD_URL, name: 'abcd'});
 }
 
 var pass = chrome.test.callbackPass;
@@ -83,34 +83,34 @@ chrome.test.runTests([
     chrome.test.assertEq('3', readCookie('c'));
     chrome.test.assertEq(null, readCookie('nonexistent'));
     // Invalid schemes don't work with the cookie API.
-    chrome.experimental.cookies.get(
+    chrome.cookies.get(
         {url: document.location.href, name: 'a'},
         fail('No host permissions for cookies at url: "' +
              document.location.href + '".'));
   },
   function getBasicCookie() {
     removeTestCookies();
-    chrome.experimental.cookies.set(TEST_BASIC_COOKIE);
+    chrome.cookies.set(TEST_BASIC_COOKIE);
     // Domain doesn't match.
-    chrome.experimental.cookies.get(
+    chrome.cookies.get(
         {url: TEST_URL2, name: TEST_BASIC_COOKIE.name},
         pass(expectNullCookie));
     // URL invalid.
-    chrome.experimental.cookies.get(
+    chrome.cookies.get(
         {url: 'invalid url', name: TEST_BASIC_COOKIE.name},
         fail('Invalid url: "invalid url".'));
     // URL lacking permissions.
-    chrome.experimental.cookies.get(
+    chrome.cookies.get(
         {url: TEST_UNPERMITTED_URL, name: TEST_BASIC_COOKIE.name},
         fail('No host permissions for cookies at url: "' +
              TEST_UNPERMITTED_URL + '".'));
     // Store ID invalid.
-    chrome.experimental.cookies.get({
+    chrome.cookies.get({
       url: TEST_BASIC_COOKIE.url,
       name: TEST_BASIC_COOKIE.name,
       storeId: 'invalid'
     }, fail('Invalid cookie store id: "invalid".'));
-    chrome.experimental.cookies.get(
+    chrome.cookies.get(
         {url: TEST_BASIC_COOKIE.url, name: TEST_BASIC_COOKIE.name},
         pass(function(cookie) {
           expectValidCookie(cookie);
@@ -130,8 +130,8 @@ chrome.test.runTests([
   },
   function getDomainCookie() {
     removeTestCookies();
-    chrome.experimental.cookies.set(TEST_DOMAIN_COOKIE);
-    chrome.experimental.cookies.get(
+    chrome.cookies.set(TEST_DOMAIN_COOKIE);
+    chrome.cookies.get(
         {url: TEST_URL2, name: TEST_DOMAIN_COOKIE.name},
         pass(function(cookie) {
           expectValidCookie(cookie);
@@ -148,16 +148,16 @@ chrome.test.runTests([
   },
   function getSecureCookie() {
     removeTestCookies();
-    chrome.experimental.cookies.set(TEST_SECURE_COOKIE);
+    chrome.cookies.set(TEST_SECURE_COOKIE);
     // Original URL doesn't work because scheme isn't secure.
-    chrome.experimental.cookies.get(
+    chrome.cookies.get(
         {url: TEST_SECURE_COOKIE.url, name: TEST_SECURE_COOKIE.name},
         pass(expectNullCookie));
     // Path doesn't match.
-    chrome.experimental.cookies.get(
+    chrome.cookies.get(
         {url: TEST_URL3, name: TEST_SECURE_COOKIE.name},
         pass(expectNullCookie));
-    chrome.experimental.cookies.get(
+    chrome.cookies.get(
         {url: TEST_URL4, name: TEST_SECURE_COOKIE.name},
         pass(function(cookie) {
           expectValidCookie(cookie);
@@ -174,33 +174,33 @@ chrome.test.runTests([
   function setOddCookies() {
     removeTestCookies();
     // URL lacking permissions.
-    chrome.experimental.cookies.set(
+    chrome.cookies.set(
         {url: TEST_UNPERMITTED_URL, name: 'abcd', domain: TEST_DOMAIN});
-    chrome.experimental.cookies.get({url: TEST_URL, name: 'abcd'},
+    chrome.cookies.get({url: TEST_URL, name: 'abcd'},
         pass(expectNullCookie));
     // Attribute values containing invalid characters are disallowed.
-    chrome.experimental.cookies.set({url: TEST_URL, name: 'abcd=efg'});
-    chrome.experimental.cookies.get({url: TEST_URL, name: 'abcd'},
+    chrome.cookies.set({url: TEST_URL, name: 'abcd=efg'});
+    chrome.cookies.get({url: TEST_URL, name: 'abcd'},
         pass(expectNullCookie));
-    chrome.experimental.cookies.set(
+    chrome.cookies.set(
         {url: TEST_URL, name: 'abcd', value: 'HI;LO'});
-    chrome.experimental.cookies.get({url: TEST_URL, name: 'abcd'},
+    chrome.cookies.get({url: TEST_URL, name: 'abcd'},
         pass(expectNullCookie));
-    chrome.experimental.cookies.set(
+    chrome.cookies.set(
         {url: TEST_URL, name: 'abcd', domain: 'cookies.com\r'});
-    chrome.experimental.cookies.get({url: TEST_URL, name: 'abcd'},
+    chrome.cookies.get({url: TEST_URL, name: 'abcd'},
         pass(expectNullCookie));
-    chrome.experimental.cookies.set(
+    chrome.cookies.set(
         {url: TEST_URL, name: 'abcd', domain: 'somedomain.com'});
-    chrome.experimental.cookies.get({url: TEST_URL, name: 'abcd'},
+    chrome.cookies.get({url: TEST_URL, name: 'abcd'},
         pass(expectNullCookie));
-    chrome.experimental.cookies.set({
+    chrome.cookies.set({
       url: TEST_ODD_URL,
       name: 'abcd',
       domain: TEST_ODD_DOMAIN,
       path: TEST_ODD_PATH
     });
-    chrome.experimental.cookies.get({url: TEST_ODD_URL, name: 'abcd'},
+    chrome.cookies.get({url: TEST_ODD_URL, name: 'abcd'},
         pass(function(cookie) {
           expectValidCookie(cookie);
           chrome.test.assertEq(TEST_ODD_DOMAIN, unescape(cookie.domain));
@@ -209,65 +209,65 @@ chrome.test.runTests([
   },
   function removeCookie() {
     removeTestCookies();
-    chrome.experimental.cookies.set(TEST_BASIC_COOKIE);
-    chrome.experimental.cookies.get(
+    chrome.cookies.set(TEST_BASIC_COOKIE);
+    chrome.cookies.get(
         {url: TEST_URL, name: TEST_BASIC_COOKIE.name},
         pass(expectValidCookie));
     // Removal with any domain-matching URL will do.
-    chrome.experimental.cookies.remove(
+    chrome.cookies.remove(
         {url: TEST_URL4, name: TEST_BASIC_COOKIE.name});
-    chrome.experimental.cookies.get(
+    chrome.cookies.get(
         {url: TEST_URL, name: TEST_BASIC_COOKIE.name},
         pass(expectNullCookie));
     // Set with an expired date should also remove the cookie.
-    chrome.experimental.cookies.set(TEST_BASIC_COOKIE);
-    chrome.experimental.cookies.get(
+    chrome.cookies.set(TEST_BASIC_COOKIE);
+    chrome.cookies.get(
         {url: TEST_URL, name: TEST_BASIC_COOKIE.name},
         pass(expectValidCookie));
-    chrome.experimental.cookies.set(TEST_BASIC_EXPIRED_COOKIE);
-    chrome.experimental.cookies.get(
+    chrome.cookies.set(TEST_BASIC_EXPIRED_COOKIE);
+    chrome.cookies.get(
         {url: TEST_URL, name: TEST_BASIC_COOKIE.name},
         pass(expectNullCookie));
     // Removal with a disallowed URL shouldn't do anything.
-    chrome.experimental.cookies.set(TEST_DOMAIN_COOKIE);
-    chrome.experimental.cookies.get(
+    chrome.cookies.set(TEST_DOMAIN_COOKIE);
+    chrome.cookies.get(
         {url: TEST_URL2, name: TEST_DOMAIN_COOKIE.name},
         pass(expectValidCookie));
-    chrome.experimental.cookies.remove(
+    chrome.cookies.remove(
         {url: TEST_UNPERMITTED_URL, name: TEST_DOMAIN_COOKIE.name});
-    chrome.experimental.cookies.get(
+    chrome.cookies.get(
         {url: TEST_URL2, name: TEST_DOMAIN_COOKIE.name},
         pass(expectValidCookie));
   },
   function getAllCookies() {
     removeTestCookies();
-    chrome.experimental.cookies.getAll({}, pass(function(cookies) {
+    chrome.cookies.getAll({}, pass(function(cookies) {
       chrome.test.assertEq(0, cookies.length);
     }));
-    chrome.experimental.cookies.set(TEST_BASIC_COOKIE);
-    chrome.experimental.cookies.set(TEST_SECURE_COOKIE);
-    chrome.experimental.cookies.getAll(
+    chrome.cookies.set(TEST_BASIC_COOKIE);
+    chrome.cookies.set(TEST_SECURE_COOKIE);
+    chrome.cookies.getAll(
         {domain: TEST_DOMAIN}, pass(function(cookies) {
       chrome.test.assertEq(2, cookies.length);
       chrome.test.assertEq(TEST_BASIC_COOKIE.name, cookies[0].name);
       chrome.test.assertEq(TEST_SECURE_COOKIE.name, cookies[1].name);
     }));
-    chrome.experimental.cookies.getAll({
+    chrome.cookies.getAll({
       name: TEST_BASIC_COOKIE.name
     }, pass(function(cookies) {
       chrome.test.assertEq(1, cookies.length);
       chrome.test.assertEq(TEST_BASIC_COOKIE.name, cookies[0].name);
     }));
-    chrome.experimental.cookies.getAll({
+    chrome.cookies.getAll({
       secure: true
     }, pass(function(cookies) {
       chrome.test.assertEq(1, cookies.length);
       chrome.test.assertEq(TEST_SECURE_COOKIE.name, cookies[0].name);
     }));
-    chrome.experimental.cookies.getAll({
+    chrome.cookies.getAll({
       url: 'invalid url'
     }, fail('Invalid url: "invalid url".'));
-    chrome.experimental.cookies.getAll({
+    chrome.cookies.getAll({
       url: TEST_URL,
     }, pass(function(cookies) {
       chrome.test.assertEq(1, cookies.length);
@@ -276,16 +276,16 @@ chrome.test.runTests([
   },
   function getAllCookieStores() {
     removeTestCookies();
-    chrome.experimental.cookies.getAllCookieStores(
+    chrome.cookies.getAllCookieStores(
         pass(function(cookieStores) {
           chrome.test.assertEq(1, cookieStores.length);
-          chrome.experimental.cookies.set(TEST_BASIC_COOKIE);
-          chrome.experimental.cookies.get(
+          chrome.cookies.set(TEST_BASIC_COOKIE);
+          chrome.cookies.get(
               {url: TEST_URL, name: TEST_BASIC_COOKIE.name},
               pass(function(cookie) {
                 chrome.test.assertEq(cookieStores[0].id, cookie.storeId);
               }));
-          chrome.experimental.cookies.getAll(
+          chrome.cookies.getAll(
               {storeId: cookieStores[0].id},
               pass(function(cookies) {
                 chrome.test.assertEq(1, cookies.length);
diff --git a/chrome/test/data/extensions/api_test/cookies/events/manifest.json b/chrome/test/data/extensions/api_test/cookies/events/manifest.json
index e1a901f..1778ecc 100644
--- a/chrome/test/data/extensions/api_test/cookies/events/manifest.json
+++ b/chrome/test/data/extensions/api_test/cookies/events/manifest.json
@@ -2,6 +2,6 @@
   "name": "events",
   "version": "1.0",
   "description": "Tests cookie events.",
-  "permissions": ["http://a.com/", "experimental"],
+  "permissions": ["cookies", "http://a.com/"],
   "background_page": "test.html"
 }
diff --git a/chrome/test/data/extensions/api_test/cookies/events/test.html b/chrome/test/data/extensions/api_test/cookies/events/test.html
index d42f385..f5b9eb6 100644
--- a/chrome/test/data/extensions/api_test/cookies/events/test.html
+++ b/chrome/test/data/extensions/api_test/cookies/events/test.html
@@ -1,5 +1,5 @@
 <script>
-chrome.experimental.cookies.onChanged.addListener(function (info) {
+chrome.cookies.onChanged.addListener(function (info) {
     if (!info.removed &&
         info.cookie.name == 'test' &&
         info.cookie.value == '42' &&
@@ -16,8 +16,8 @@ chrome.experimental.cookies.onChanged.addListener(function (info) {
       chrome.test.notifyFail("Got an invalid cookie: " +  JSON.stringify(info));
     }
 });
-chrome.experimental.cookies.set({url: 'http://a.com/path',
-                                 name: 'test',
-                                 value: '42',
-                                 expirationDate: 12345678900});
+chrome.cookies.set({url: 'http://a.com/path',
+                    name: 'test',
+                    value: '42',
+                    expirationDate: 12345678900});
 </script>
diff --git a/chrome/test/data/extensions/api_test/cookies/no_permission/background.html b/chrome/test/data/extensions/api_test/cookies/no_permission/background.html
new file mode 100644
index 0000000..2c0c453
--- /dev/null
+++ b/chrome/test/data/extensions/api_test/cookies/no_permission/background.html
@@ -0,0 +1,17 @@
+<script>
+chrome.test.runTests([
+  function readCookies() {
+    try {
+      chrome.cookies.get({url: document.location.href, name: 'a'}, function() {
+      });
+    } catch (e) {
+      chrome.test.assertTrue(e.message.indexOf(
+          "You do not have permission to use 'cookies.get'.") == 0);
+      chrome.test.succeed();
+      return;
+    }
+
+    chrome.test.fail();
+  }
+]);
+</script>
diff --git a/chrome/test/data/extensions/api_test/cookies/no_permission/manifest.json b/chrome/test/data/extensions/api_test/cookies/no_permission/manifest.json
new file mode 100644
index 0000000..74b4572
--- /dev/null
+++ b/chrome/test/data/extensions/api_test/cookies/no_permission/manifest.json
@@ -0,0 +1,13 @@
+{
+  "name": "chrome.cookies.nopermission",
+  "version": "0.1",
+  "description": "Tests that the cookies permission is required in order to use the cookies API.",
+  "background_page": "background.html",
+  "permissions": [
+    "tabs",
+    "http://*.chrome_extensions.cookies.com/",
+    "http://chromium.cookies.com/",
+    "https://*.cookies.com/",
+    "http://.strange%20stuff%21%21.com/"
+  ]
+}