Move another bunch of extension API tests to manifest_version 2.

chrome/test/data/extensions/api_test/cookies/api/tab.html

Index: chrome/test/data/extensions/api_test/cookies/api/tab.html
===================================================================
--- chrome/test/data/extensions/api_test/cookies/api/tab.html	(revision 111763)
+++ chrome/test/data/extensions/api_test/cookies/api/tab.html	(working copy)
@@ -1,383 +1,6 @@
-<script>
-var TEST_DOMAIN = 'cookies.com';
-var TEST_PATH = '/auth';
-var TEST_HOST = 'www.chrome_extensions.' + TEST_DOMAIN;
-var TEST_URL = 'http://' + TEST_HOST + '/foobar.html?arg=toolbar&param=true';
-var TEST_URL2 = 'http://chromium.' + TEST_DOMAIN + '/index.html';
-var TEST_URL3 = 'https://' + TEST_HOST + '/content.html';
-var TEST_URL4 = 'https://' + TEST_HOST + TEST_PATH + '/content.html';
-var TEST_URL5 = 'http://' + TEST_HOST + TEST_PATH + '/content.html';
-var TEST_EXPIRATION_DATE = 12345678900;
-var TEST_ODD_DOMAIN = '.strange stuff!!.com';
-var TEST_ODD_PATH = '/hello = world';
-var TEST_ODD_URL = 'http://' + TEST_ODD_DOMAIN + TEST_ODD_PATH + '/index.html';
-var TEST_UNPERMITTED_URL = 'http://illegal.' + TEST_DOMAIN + '/';
-
-var TEST_BASIC_COOKIE = {
-  url: TEST_URL,
-  name: 'api_test_cookie',
-  value: 'helloworld'
-};
-var TEST_DOMAIN_COOKIE = {
-  url: TEST_URL,
-  name: 'TEST_domain',
-  value: '32849395FFDSAA**##@@@',
-  domain: TEST_DOMAIN,
-  expirationDate: TEST_EXPIRATION_DATE
-};
-var TEST_SECURE_COOKIE = {
-  url: TEST_URL5,
-  name: 'SECRETCOOKIE',
-  value: 'foobar_password',
-  secure: true,
-  httpOnly: true
-};
-var TEST_BASIC_EXPIRED_COOKIE = {
-  url: TEST_BASIC_COOKIE.url,
-  name: TEST_BASIC_COOKIE.name,
-  value: TEST_BASIC_COOKIE.value,
-  expirationDate: 0
-};
-
-function readCookie(name) {
-  var nameEQ = name + '=';
-  var cookies = document.cookie.split(';');
-  for(var i=0; i < cookies.length; i++) {
-    var c = cookies[i];
-    while (c.charAt(0)==' ') {
-      c = c.substring(1);
-    }
-    if (c.indexOf(nameEQ) == 0) {
-      return c.substring(nameEQ.length);
-    }
-  }
-  return null;
-}
-
-function expectValidCookie(cookie) {
-  chrome.test.assertTrue(cookie != null, 'Expected cookie not set.');
-}
-
-function expectNullCookie(cookie) {
-  chrome.test.assertEq(null, cookie);
-}
-
-function expectUndefinedCookie(cookie) {
-  chrome.test.assertEq(undefined, cookie);
-}
-
-function removeTestCookies() {
-  chrome.cookies.remove(
-      {url: TEST_URL, name: TEST_BASIC_COOKIE.name});
-  chrome.cookies.remove(
-      {url: TEST_URL, name: TEST_DOMAIN_COOKIE.name});
-  chrome.cookies.remove(
-      {url: TEST_URL4, name: TEST_SECURE_COOKIE.name});
-  chrome.cookies.remove({url: TEST_URL, name: 'abcd'});
-  chrome.cookies.remove({url: TEST_ODD_URL, name: 'abcd'});
-}
-
-var pass = chrome.test.callbackPass;
-var fail = chrome.test.callbackFail;
-
-chrome.test.runTests([
-  function readCookies() {
-    chrome.test.assertEq('1', readCookie('a'));
-    chrome.test.assertEq('2', readCookie('b'));
-    chrome.test.assertEq('3', readCookie('c'));
-    chrome.test.assertEq(null, readCookie('nonexistent'));
-    // Invalid schemes don't work with the cookie API.
-    chrome.cookies.get(
-        {url: document.location.href, name: 'a'},
-        fail('No host permissions for cookies at url: "' +
-             document.location.href + '".'));
-  },
-  function getBasicCookie() {
-    removeTestCookies();
-    chrome.cookies.set(TEST_BASIC_COOKIE);
-    // Domain doesn't match.
-    chrome.cookies.get(
-        {url: TEST_URL2, name: TEST_BASIC_COOKIE.name},
-        pass(expectNullCookie));
-    // URL invalid.
-    chrome.cookies.get(
-        {url: 'invalid url', name: TEST_BASIC_COOKIE.name},
-        fail('Invalid url: "invalid url".'));
-    // URL lacking permissions.
-    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.cookies.get({
-      url: TEST_BASIC_COOKIE.url,
-      name: TEST_BASIC_COOKIE.name,
-      storeId: 'invalid'
-    }, fail('Invalid cookie store id: "invalid".'));
-    chrome.cookies.get(
-        {url: TEST_BASIC_COOKIE.url, name: TEST_BASIC_COOKIE.name},
-        pass(function(cookie) {
-          expectValidCookie(cookie);
-          chrome.test.assertEq(TEST_BASIC_COOKIE.name, cookie.name);
-          chrome.test.assertEq(TEST_BASIC_COOKIE.value, cookie.value);
-          chrome.test.assertEq(TEST_HOST, cookie.domain);
-          chrome.test.assertEq(true, cookie.hostOnly);
-          chrome.test.assertEq('/', cookie.path);
-          chrome.test.assertEq(false, cookie.secure);
-          chrome.test.assertEq(false, cookie.httpOnly);
-          chrome.test.assertEq(true, cookie.session);
-          chrome.test.assertTrue(typeof cookie.expirationDate === 'undefined',
-              'Session cookie should not have expirationDate property.');
-          chrome.test.assertTrue(typeof cookie.storeId !== 'undefined',
-                                 'Cookie store ID not provided.');
-        }));
-  },
-  function getDomainCookie() {
-    removeTestCookies();
-    chrome.cookies.set(TEST_DOMAIN_COOKIE);
-    chrome.cookies.get(
-        {url: TEST_URL2, name: TEST_DOMAIN_COOKIE.name},
-        pass(function(cookie) {
-          expectValidCookie(cookie);
-          chrome.test.assertEq(TEST_DOMAIN_COOKIE.name, cookie.name);
-          chrome.test.assertEq(TEST_DOMAIN_COOKIE.value, cookie.value);
-          chrome.test.assertEq('.' + TEST_DOMAIN, cookie.domain);
-          chrome.test.assertEq(false, cookie.hostOnly);
-          chrome.test.assertEq('/', cookie.path);
-          chrome.test.assertEq(false, cookie.secure);
-          chrome.test.assertEq(false, cookie.httpOnly);
-          chrome.test.assertEq(false, cookie.session);
-          chrome.test.assertEq(TEST_EXPIRATION_DATE, cookie.expirationDate);
-        }));
-  },
-  function getSecureCookie() {
-    removeTestCookies();
-    chrome.cookies.set(TEST_SECURE_COOKIE);
-    // Original URL doesn't work because scheme isn't secure.
-    chrome.cookies.get(
-        {url: TEST_SECURE_COOKIE.url, name: TEST_SECURE_COOKIE.name},
-        pass(expectNullCookie));
-    // Path doesn't match.
-    chrome.cookies.get(
-        {url: TEST_URL3, name: TEST_SECURE_COOKIE.name},
-        pass(expectNullCookie));
-    chrome.cookies.get(
-        {url: TEST_URL4, name: TEST_SECURE_COOKIE.name},
-        pass(function(cookie) {
-          expectValidCookie(cookie);
-          chrome.test.assertEq(TEST_SECURE_COOKIE.name, cookie.name);
-          chrome.test.assertEq(TEST_SECURE_COOKIE.value, cookie.value);
-          chrome.test.assertEq(TEST_HOST, cookie.domain);
-          chrome.test.assertEq(true, cookie.hostOnly);
-          chrome.test.assertEq(TEST_PATH, cookie.path);
-          chrome.test.assertEq(true, cookie.secure);
-          chrome.test.assertEq(true, cookie.httpOnly);
-          chrome.test.assertEq(true, cookie.session);
-        }));
-  },
-  function setOddCookies() {
-    removeTestCookies();
-    // URL lacking permissions.
-    chrome.cookies.set(
-        {url: TEST_UNPERMITTED_URL, name: 'abcd', domain: TEST_DOMAIN});
-    chrome.cookies.get({url: TEST_URL, name: 'abcd'},
-        pass(expectNullCookie));
-    // Attribute values containing invalid characters are disallowed.
-    chrome.cookies.set({url: TEST_URL, name: 'abcd=efg'});
-    chrome.cookies.get({url: TEST_URL, name: 'abcd'},
-        pass(expectNullCookie));
-    chrome.cookies.set(
-        {url: TEST_URL, name: 'abcd', value: 'HI;LO'});
-    chrome.cookies.get({url: TEST_URL, name: 'abcd'},
-        pass(expectNullCookie));
-    chrome.cookies.set(
-        {url: TEST_URL, name: 'abcd', domain: 'cookies.com\r'});
-    chrome.cookies.get({url: TEST_URL, name: 'abcd'},
-        pass(expectNullCookie));
-    chrome.cookies.set(
-        {url: TEST_URL, name: 'abcd', domain: 'somedomain.com'});
-    chrome.cookies.get({url: TEST_URL, name: 'abcd'},
-        pass(expectNullCookie));
-    chrome.cookies.set({
-      url: TEST_ODD_URL,
-      name: 'abcd',
-      domain: TEST_ODD_DOMAIN,
-      path: TEST_ODD_PATH
-    });
-    chrome.cookies.get({url: TEST_ODD_URL, name: 'abcd'},
-        pass(function(cookie) {
-          expectValidCookie(cookie);
-          chrome.test.assertEq(TEST_ODD_DOMAIN, unescape(cookie.domain));
-          chrome.test.assertEq(TEST_ODD_PATH, unescape(cookie.path));
-        }));
-  },
-  function setCookiesWithCallbacks() {
-    removeTestCookies();
-    // Basics.
-    chrome.cookies.set(
-        TEST_BASIC_COOKIE,
-        pass(function(cookie) {
-          expectValidCookie(cookie);
-          chrome.test.assertEq(TEST_BASIC_COOKIE.name, cookie.name);
-          chrome.test.assertEq(TEST_BASIC_COOKIE.value, cookie.value);
-          chrome.test.assertEq(TEST_HOST, cookie.domain);
-          chrome.test.assertEq(true, cookie.hostOnly);
-          chrome.test.assertEq('/', cookie.path);
-          chrome.test.assertEq(false, cookie.secure);
-          chrome.test.assertEq(false, cookie.httpOnly);
-          chrome.test.assertEq(true, cookie.session);
-          chrome.test.assertTrue(typeof cookie.expirationDate === 'undefined',
-              'Session cookie should not have expirationDate property.');
-          chrome.test.assertTrue(typeof cookie.storeId !== 'undefined',
-                                 'Cookie store ID not provided.');
-        }));
-    // Invalid values generate callback with no arguments, and error messages
-    chrome.cookies.set(
-        {url: TEST_UNPERMITTED_URL, name: 'abcd', domain: TEST_DOMAIN},
-        fail(
-            'No host permissions for cookies at url: "'
-                + TEST_UNPERMITTED_URL + '".',
-             expectUndefinedCookie));
-    chrome.cookies.set(
-        {url: TEST_URL, name: 'abcd=efg'},
-        fail('Failed to parse or set cookie named "abcd=efg".',
-             expectUndefinedCookie));
-    chrome.cookies.set(
-        {url: TEST_URL, name: 'abcd', value: 'HI;LO'},
-        fail('Failed to parse or set cookie named "abcd".',
-             expectUndefinedCookie));
-    chrome.cookies.set(
-        {url: TEST_URL, name: 'abcd', domain: 'cookies.com\r'},
-        fail('Failed to parse or set cookie named "abcd".',
-             expectUndefinedCookie));
-    chrome.cookies.set(
-        {url: TEST_URL, name: 'abcd', domain: 'somedomain.com'},
-        fail('Failed to parse or set cookie named "abcd".',
-            expectUndefinedCookie));
-    // Expired cookies generate callback with "null" cookie
-    chrome.cookies.set(TEST_BASIC_EXPIRED_COOKIE, pass(expectUndefinedCookie));
-    // Odd (but valid!) URLs get callbacks too!
-    chrome.cookies.set({
-      url: TEST_ODD_URL,
-      name: 'abcd',
-      domain: TEST_ODD_DOMAIN,
-      path: TEST_ODD_PATH
-    }, pass(function(cookie) {
-      expectValidCookie(cookie);
-      chrome.test.assertEq(TEST_ODD_DOMAIN, unescape(cookie.domain));
-      chrome.test.assertEq(TEST_ODD_PATH, unescape(cookie.path));
-    }));
-  },
-  function removeCookie() {
-    removeTestCookies();
-    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.cookies.remove(
-        {url: TEST_URL4, name: TEST_BASIC_COOKIE.name});
-    chrome.cookies.get(
-        {url: TEST_URL, name: TEST_BASIC_COOKIE.name},
-        pass(expectNullCookie));
-    // Set with an expired date should also remove the cookie.
-    chrome.cookies.set(TEST_BASIC_COOKIE);
-    chrome.cookies.get(
-        {url: TEST_URL, name: TEST_BASIC_COOKIE.name},
-        pass(expectValidCookie));
-    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.cookies.set(TEST_DOMAIN_COOKIE);
-    chrome.cookies.get(
-        {url: TEST_URL2, name: TEST_DOMAIN_COOKIE.name},
-        pass(expectValidCookie));
-    chrome.cookies.remove(
-        {url: TEST_UNPERMITTED_URL, name: TEST_DOMAIN_COOKIE.name});
-    chrome.cookies.get(
-        {url: TEST_URL2, name: TEST_DOMAIN_COOKIE.name},
-        pass(expectValidCookie));
-  },
-  function removeCookiesWithCallbacks() {
-    removeTestCookies();
-    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 trigger callback with the
-    // removed cookie's "url" and "name" fields.
-    chrome.cookies.remove(
-        {url: TEST_URL4, name: TEST_BASIC_COOKIE.name}, pass(function(data) {
-          chrome.test.assertEq(TEST_URL4, data.url);
-          chrome.test.assertEq(TEST_BASIC_COOKIE.name, data.name);
-          chrome.test.assertTrue(typeof data.storeId !== 'undefined',
-                                 'Cookie store ID not provided.');
-        }));
-    // Removal with a disallowed URL should trigger the callback with no
-    // arguments, and a set error message.
-    chrome.cookies.set(TEST_DOMAIN_COOKIE);
-    chrome.cookies.remove(
-        {url: TEST_UNPERMITTED_URL, name: TEST_DOMAIN_COOKIE.name},
-        fail(
-            'No host permissions for cookies at url: "'
-              + TEST_UNPERMITTED_URL + '".',
-            expectUndefinedCookie));
-  },
-  function getAllCookies() {
-    removeTestCookies();
-    chrome.cookies.getAll({}, pass(function(cookies) {
-      chrome.test.assertEq(0, cookies.length);
-    }));
-    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_SECURE_COOKIE.name, cookies[0].name);
-      chrome.test.assertEq(TEST_BASIC_COOKIE.name, cookies[1].name);
-    }));
-    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.cookies.getAll({
-      secure: true
-    }, pass(function(cookies) {
-      chrome.test.assertEq(1, cookies.length);
-      chrome.test.assertEq(TEST_SECURE_COOKIE.name, cookies[0].name);
-    }));
-    chrome.cookies.getAll({
-      url: 'invalid url'
-    }, fail('Invalid url: "invalid url".'));
-    chrome.cookies.getAll({
-      url: TEST_URL,
-    }, pass(function(cookies) {
-      chrome.test.assertEq(1, cookies.length);
-      chrome.test.assertEq(TEST_BASIC_COOKIE.name, cookies[0].name);
-    }));
-  },
-  function getAllCookieStores() {
-    removeTestCookies();
-    chrome.cookies.getAllCookieStores(
-        pass(function(cookieStores) {
-          chrome.test.assertEq(1, cookieStores.length);
-          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.cookies.getAll(
-              {storeId: cookieStores[0].id},
-              pass(function(cookies) {
-                chrome.test.assertEq(1, cookies.length);
-                chrome.test.assertEq(TEST_BASIC_COOKIE.name, cookies[0].name);
-              }));
-        }));
-  }
-]);
-</script>
+<!--
+ * Copyright (c) 2011 The Chromium Authors. All rights reserved.  Use of this
+ * source code is governed by a BSD-style license that can be found in the
+ * LICENSE file.
+-->
+<script src="tab.js"></script>