Add origin permissions to the extension permissions API.

chrome/test/data/extensions/api_test/permissions/optional/background.html

Index: chrome/test/data/extensions/api_test/permissions/optional/background.html
diff --git a/chrome/test/data/extensions/api_test/permissions/optional/background.html b/chrome/test/data/extensions/api_test/permissions/optional/background.html
index c53a327991c95e93d01bd926d8eec4d1ed291f55..79a566d7ba83524a8bd8d8b134debc39465d7cbc 100644
--- a/chrome/test/data/extensions/api_test/permissions/optional/background.html
+++ b/chrome/test/data/extensions/api_test/permissions/optional/background.html
@@ -1,188 +1,283 @@
-<script>
+<script>
+
+var assertEq = chrome.test.assertEq;
+var assertFalse = chrome.test.assertFalse;
+var assertTrue = chrome.test.assertTrue;
+var fail = chrome.test.callbackFail;
+var pass = chrome.test.callbackPass;
+var listenOnce = chrome.test.listenOnce;
+
+var NOT_OPTIONAL_ERROR =
+    "Optional permissions must be listed in extension manifest.";
+
+var NO_TABS_PERMISSION =
+    "You do not have permission to use 'windows.getAll'.";
+
+var REQUIRED_ERROR =
+    "You cannot remove required permissions.";
+
+var NOT_WHITE_LISTED_ERROR =
+    "The optional permissions API does not support '*'.";
+
+var UNKNOWN_PERMISSIONS_ERROR =
+    "'*' is not a recognized permission.";
+
+var emptyPermissions = {permissions: [], origins: []};
+
+var initialPermissions = {
+  permissions: ['experimental', 'management', 'permissions'],
+  origins: ['http://a.com/*']
+};
+
+var permissionsWithTabs = {
+  permissions: ['experimental', 'management', 'permissions', 'tabs'],
+  origins: ['http://a.com/*']
+}
+
+var permissionsWithOrigin = {
+  permissions: ['experimental', 'management', 'permissions'],
+  origins: ['http://a.com/*', 'http://*.c.com/*']
+}
+
+function checkEqualSets(set1, set2) {
+  if (set1.length != set2.length)
+    return false;
+
+  for (var x = 0; x < set1.length; x++) {
+    if (!set2.some(function(v) { return v == set1[x]; }))
+      return false;
+  }
+
+  return true;
+}
+
+function checkPermSetsEq(set1, set2) {
+  return checkEqualSets(set1.permissions, set2.permissions) &&
+         checkEqualSets(set1.origins, set2.origins);
+}
+
+chrome.test.getConfig(function(config) {
+
+  function doReq(domain, callback) {
+    var req = new XMLHttpRequest();
+    var url = domain + ":PORT/files/extensions/test_file.txt";
+    url = url.replace(/PORT/, config.testServer.port);
+
+    chrome.test.log("Requesting url: " + url);
+    req.open("GET", url, true);
+
+    req.onload = function() {
+      assertEq(200, req.status);
+      assertEq("Hello!", req.responseText);
+      callback(true);
+    };
+
+    req.onerror = function() {
+      chrome.test.log("status: " + req.status);
+      chrome.test.log("text: " + req.responseText);
+      callback(false);
+    };
+
+    req.send(null);
+  }
+
+  chrome.test.runTests([
+    function contains() {
+      chrome.experimental.permissions.contains(
+          {permissions: ['management'], origins: ['http://a.com/*']},
+          pass(function(result) { assertTrue(result); }));
+      chrome.experimental.permissions.contains(
+          {permissions: ['devtools'], origins: ['http://a.com/*']},
+          pass(function(result) { assertFalse(result); }));
+      chrome.experimental.permissions.contains(
+          {permissions: ['permissions', 'management']},
+          pass(function(result) { assertTrue(result); }));
+      chrome.experimental.permissions.contains(
+          {permissions: ['management', 'permissions']},
+          pass(function(result) { assertTrue(result); }));
+    },
+
+    function getAll() {
+      chrome.experimental.permissions.getAll(pass(function(permissions) {
+        assertTrue(checkPermSetsEq(initialPermissions, permissions));
+      }));
+    },
+
+    // Nothing should happen if we request permission we already have
+    function requestNoOp() {
+      chrome.experimental.permissions.request(
+          {permissions:['management'], origins:['http://a.com/*']},
+          pass(function(granted) { assertTrue(granted); }));
+    },
+
+    // We should get an error when requesting permissions that haven't been
+    // defined in "optional_permissions".
+    function requestNonOptional() {
+      chrome.experimental.permissions.request(
+          {permissions: ['debugger']}, fail(NOT_OPTIONAL_ERROR));
+      chrome.experimental.permissions.request(
+          {origins: ['http://*.b.com/*']}, fail(NOT_OPTIONAL_ERROR));
+      chrome.experimental.permissions.request(
+          {permissions: ['tabs'], origins: ['http://*.b.com/*']},
+          fail(NOT_OPTIONAL_ERROR));
+    },
+
+    // We should be able to request the tabs API since it's in the granted
+    // permissions list (see permissions_apitest.cc).
+    function requestTabs() {
+      try {
+        chrome.windows.getAll({populate: true}, function() {
+          chrome.test.fail("Should not have tabs API permission.");
+        });
+      } catch (e) {
+        assertTrue(e.message.indexOf(NO_TABS_PERMISSION) == 0);
+      }
+      listenOnce(chrome.experimental.permissions.onAdded,
+                 function(permissions) {
+        assertTrue(permissions.permissions.length == 1);
+        assertTrue(permissions.permissions[0] == 'tabs');
+      });
+      chrome.experimental.permissions.request(
+          {permissions:['tabs']},
+          pass(function(granted) {
+            assertTrue(granted);
+            chrome.windows.getAll({populate: true}, pass(function(windows) {
+              assertTrue(true);
+            }));
+            chrome.experimental.permissions.getAll(pass(function(permissions) {
+              assertTrue(checkPermSetsEq(permissionsWithTabs, permissions));
+            }));
+      }));
+    },
+
+    // You can't remove required permissions.
+    function removeRequired() {
+      chrome.experimental.permissions.remove(
+          {permissions: ['management']}, fail(REQUIRED_ERROR));
+      chrome.experimental.permissions.remove(
+          {origins: ['http://a.com/*']}, fail(REQUIRED_ERROR));
+      chrome.experimental.permissions.remove(
+          {permissions: ['tabs'], origins: ['http://a.com/*']},
+          fail(REQUIRED_ERROR));
+    },
+
+    // You can remove permissions you don't have (nothing happens).
+    function removeNoOp() {
+      chrome.experimental.permissions.remove(
+          {permissions:['background']},
+          pass(function(removed) { assertTrue(removed); }));
+      chrome.experimental.permissions.remove(
+          {origins:['http://*.c.com/*']},
+          pass(function(removed) { assertTrue(removed); }));
+      chrome.experimental.permissions.remove(
+          {permissions:['background'], origins:['http://*.c.com/*']},
+          pass(function(removed) { assertTrue(removed); }));
+    },
+
+    function removeTabs() {
+      chrome.windows.getAll({populate: true}, pass(function(windows) {
+        assertTrue(true);
+      }));
+      listenOnce(chrome.experimental.permissions.onRemoved,
+                 function(permissions) {
+        assertTrue(permissions.permissions.length == 1);
+        assertTrue(permissions.permissions[0] == 'tabs');
+      });
+      chrome.experimental.permissions.remove(
+          {permissions:['tabs']},
+          pass(function() {
+            chrome.experimental.permissions.getAll(pass(function(permissions) {
+              assertTrue(checkPermSetsEq(initialPermissions, permissions));
+            }));
+            try {
+              chrome.windows.getAll({populate: true}, function() {
+                chrome.test.fail("Should not have tabs API permission.");
+              });
+            } catch (e) {
+              assertTrue(e.message.indexOf(NO_TABS_PERMISSION) == 0);
+            }
+      }));
+    },
+
+    // The user shouldn't have to approve permissions that have no warnings.
+    function noPromptForNoWarnings() {
+      chrome.experimental.permissions.request(
+          {permissions: ['notifications']},
+          pass(function(granted) {
+        assertTrue(granted);
+
+        // Remove the notifications permission to return to normal.
+        chrome.experimental.permissions.remove(
+            {permissions: ['notifications']},
+            pass(function(removed) { assertTrue(removed); }));
+      }));
+    },
+
+    // Make sure you can only access the white listed permissions.
+    function whitelist() {
+      var error_msg = NOT_WHITE_LISTED_ERROR.replace('*', 'chromeAuthPrivate');
+      chrome.experimental.permissions.request(
+          {permissions: ['chromeAuthPrivate']}, fail(error_msg));
+      chrome.experimental.permissions.remove(
+          {permissions: ['chromeAuthPrivate']}, fail(error_msg));
+    },
+
+    function unknownPermission() {
+      var error_msg = UNKNOWN_PERMISSIONS_ERROR.replace('*', 'asdf');
+      chrome.experimental.permissions.request(
+          {permissions: ['asdf']}, fail(error_msg));
+    },
+
+    function requestOrigin() {
+      doReq('http://c.com', pass(function(success) { assertFalse(success); }));
+
+      chrome.experimental.permissions.getAll(pass(function(permissions) {
+        assertTrue(checkPermSetsEq(initialPermissions, permissions));
+      }));
 
-var assertFalse = chrome.test.assertFalse;
-var assertTrue = chrome.test.assertTrue;
-var fail = chrome.test.callbackFail;
-var pass = chrome.test.callbackPass;
-var listenOnce = chrome.test.listenOnce;
-
-var NOT_OPTIONAL_ERROR =
-    "Optional permissions must be listed in extension manifest.";
-
-var NO_TABS_PERMISSION =
-    "You do not have permission to use 'windows.getAll'.";
-
-var REQUIRED_ERROR =
-    "You cannot remove required permissions.";
-
-var NOT_WHITE_LISTED_ERROR =
-    "The optional permissions API does not support '*'.";
-
-var UNKNOWN_PERMISSIONS_ERROR =
-    "'*' is not a recognized permission.";
-
-var emptyPermissions = {permissions: []};
-
-var initialPermissions = {
-  permissions: ['experimental', 'management', 'permissions']
-};
-
-var permissionsWithTabs = {
-  permissions: ['experimental', 'management', 'permissions', 'tabs']
-}
-
-function checkEqualSets(set1, set2) {
-  if (set1.length != set2.length)
-    return false;
-
-  for (var x = 0; x < set1.length; x++) {
-    if (!set2.some(function(v) { return v == set1[x]; }))
-      return false;
-  }
-
-  return true;
-}
-
-function checkPermSetsEq(set1, set2) {
-  return checkEqualSets(set1.permissions, set2.permissions);
-}
-
-chrome.test.runTests([
-  function contains() {
-    chrome.experimental.permissions.contains(
-      {permissions: ['management']},
-      pass(function(result) {
-        assertTrue(result);
-    }));
-    chrome.experimental.permissions.contains(
-      {permissions: ['devtools']},
-      pass(function(result) {
-        assertFalse(result);
-    }));
-    chrome.experimental.permissions.contains(
-      {permissions: ['permissions', 'management']},
-      pass(function(result) {
-        assertTrue(result);
-    }));
-    chrome.experimental.permissions.contains(
-      {permissions: ['management', 'permissions']},
-      pass(function(result) {
-        assertTrue(result);
-    }));
-  },
-
-  function getAll() {
-    chrome.experimental.permissions.getAll(pass(function(permissions) {
-      assertTrue(checkPermSetsEq(initialPermissions, permissions));
-    }));
-  },
-
-  // Nothing should happen if we request permission we already have
-  function requestNoOp() {
-    chrome.experimental.permissions.request(
-      {permissions:['management']},
-      pass(function(granted) {
-        assertTrue(granted);
-    }));
-  },
-
-  // We should get an error when requesting permissions that haven't been
-  // defined in "optional_permissions".
-  function requestNonOptional() {
-    chrome.experimental.permissions.request(
-        {permissions:['debugger']}, fail(NOT_OPTIONAL_ERROR));
-  },
-
-  // We should be able to request the tabs API since it's in the granted
-  // permissions list (see permissions_apitest.cc).
-  function requestTabs() {
-    try {
-      chrome.windows.getAll({populate: true}, function() {
-        chrome.test.fail("Should not have tabs API permission.");
-      });
-    } catch (e) {
-      assertTrue(e.message.indexOf(NO_TABS_PERMISSION) == 0);
+      listenOnce(chrome.experimental.permissions.onAdded,
+                 function(permissions) {
+        assertTrue(permissions.permissions.length == 0);
+        assertTrue(permissions.origins.length == 1);
+        assertTrue(permissions.origins[0] == 'http://*.c.com/*');
+      });
+      chrome.experimental.permissions.request(
+          {origins: ['http://*.c.com/*']},
+          pass(function(granted) {
+        assertTrue(granted);
+        chrome.experimental.permissions.getAll(pass(function(permissions) {
+          assertTrue(checkPermSetsEq(permissionsWithOrigin, permissions));
+        }));
+        chrome.experimental.permissions.contains(
+            {origins:['http://*.c.com/*']},
+            pass(function(result) { assertTrue(result); }));
+        doReq('http://c.com', pass(function(result) { assertTrue(result); }));
+      }));
+    },
+
+    function removeOrigin() {
+      doReq('http://c.com', pass(function(result) { assertTrue(result); }));
+
+      listenOnce(chrome.experimental.permissions.onRemoved,
+                 function(permissions) {
+        assertTrue(permissions.permissions.length == 0);
+        assertTrue(permissions.origins.length == 1);
+        assertTrue(permissions.origins[0] == 'http://*.c.com/*');
+      });
+      chrome.experimental.permissions.remove(
+          {origins: ['http://*.c.com/*']},
+          pass(function(removed) {
+        assertTrue(removed);
+        chrome.experimental.permissions.getAll(pass(function(permissions) {
+          assertTrue(checkPermSetsEq(initialPermissions, permissions));
+        }));
+        chrome.experimental.permissions.contains(
+            {origins:['http://*.c.com/*']},
+            pass(function(result) { assertFalse(result); }));
+        doReq('http://c.com', pass(function(result) { assertFalse(result); }));
+      }));
     }
-    listenOnce(chrome.experimental.permissions.onAdded, function(permissions) {
-      assertTrue(permissions.permissions.length == 1);
-      assertTrue(permissions.permissions[0] == 'tabs');
-    });
-    chrome.experimental.permissions.request(
-      {permissions:['tabs']},
-      pass(function(granted) {
-        assertTrue(granted);
-        chrome.windows.getAll({populate: true}, pass(function(windows) {
-          assertTrue(true);
-        }));
-        chrome.experimental.permissions.getAll(pass(function(permissions) {
-          assertTrue(checkPermSetsEq(permissionsWithTabs, permissions));
-        }));
-    }));
-  },
-
-  // You can't remove required permissions.
-  function removeRequired() {
-    chrome.experimental.permissions.remove(
-        {permissions:['management']}, fail(REQUIRED_ERROR));
-  },
-
-  // You can remove permissions you don't have (nothing happens).
-  function removeNoOp() {
-    chrome.experimental.permissions.remove(
-      {permissions:['background']},
-      pass(function(removed) {
-        assertTrue(removed);
-    }));
-  },
-
-  function removeTabs() {
-    chrome.windows.getAll({populate: true}, pass(function(windows) {
-      assertTrue(true);
-    }));
-    listenOnce(chrome.experimental.permissions.onRemoved,
-               function(permissions) {
-      assertTrue(permissions.permissions.length == 1);
-      assertTrue(permissions.permissions[0] == 'tabs');
-    });
-    chrome.experimental.permissions.remove(
-      {permissions:['tabs']},
-      pass(function() {
-        chrome.experimental.permissions.getAll(pass(function(permissions) {
-          assertTrue(checkPermSetsEq(initialPermissions, permissions));
-        }));
-        try {
-          chrome.windows.getAll({populate: true}, function() {
-            chrome.test.fail("Should not have tabs API permission.");
-          });
-        } catch (e) {
-          assertTrue(e.message.indexOf(NO_TABS_PERMISSION) == 0);
-        }
-    }));
-  },
-
-  // The user shouldn't have to approve permissions that have no warnings.
-  // TODO(jstritar): move to its own test and set a low timeout
-  function noPromptForNoWarnings() {
-    chrome.experimental.permissions.request(
-      {permissions: ['notifications']},
-      pass(function(granted) {
-        assertTrue(granted);
-    }));
-  },
-
-  // Make sure you can only access the white listed permissions.
-  function whitelist() {
-    var error_msg = NOT_WHITE_LISTED_ERROR.replace('*', 'chromeAuthPrivate');
-    chrome.experimental.permissions.request(
-        {permissions: ['chromeAuthPrivate']}, fail(error_msg));
-    chrome.experimental.permissions.remove(
-        {permissions: ['chromeAuthPrivate']}, fail(error_msg));
-  },
-
-  function unknownPermission() {
-    var error_msg = UNKNOWN_PERMISSIONS_ERROR.replace('*', 'asdf');
-    chrome.experimental.permissions.request(
-      {permissions: ['asdf']}, fail(error_msg));
-  }
-]);
-</script>
+
+  ]);
+});
+</script>