summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-12 19:42:29 +0000
committerlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-12 19:42:29 +0000
commitca3e57300654b4885325712c0ff2ed0be062c637 (patch)
tree7d3ed98e58129ca4df95334cd3c9eaf8b819bd2d /chrome/test
parentf86b15aa97d6d4d94d96e3f4b503160ca40dc3e4 (diff)
downloadchromium_src-ca3e57300654b4885325712c0ff2ed0be062c637.zip
chromium_src-ca3e57300654b4885325712c0ff2ed0be062c637.tar.gz
chromium_src-ca3e57300654b4885325712c0ff2ed0be062c637.tar.bz2
Make chrome.idle have a permission.
BUG=None TEST=browser_tests.exe --gtest_filter=ExtensionApiTest.ExperimentalPermissionsFail Review URL: http://codereview.chromium.org/2976002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52122 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/data/extensions/api_test/idle/manifest.json2
-rw-r--r--chrome/test/data/extensions/api_test/permissions/disabled/background.html10
2 files changed, 11 insertions, 1 deletions
diff --git a/chrome/test/data/extensions/api_test/idle/manifest.json b/chrome/test/data/extensions/api_test/idle/manifest.json
index 5284e20..41c71f9 100644
--- a/chrome/test/data/extensions/api_test/idle/manifest.json
+++ b/chrome/test/data/extensions/api_test/idle/manifest.json
@@ -3,5 +3,5 @@
"version": "0.1",
"description": "end-to-end browser test for chrome.idle API",
"background_page": "test.html",
- "permissions": ["experimental"]
+ "permissions": ["idle"]
}
diff --git a/chrome/test/data/extensions/api_test/permissions/disabled/background.html b/chrome/test/data/extensions/api_test/permissions/disabled/background.html
index b5c52c5..6975df3 100644
--- a/chrome/test/data/extensions/api_test/permissions/disabled/background.html
+++ b/chrome/test/data/extensions/api_test/permissions/disabled/background.html
@@ -32,6 +32,16 @@ chrome.test.runTests([
} catch (e) {
chrome.test.succeed();
}
+ },
+
+ function idle() {
+ try {
+ chrome.idle.queryState(60, function(state) {
+ chrome.test.fail();
+ });
+ } catch (e) {
+ chrome.test.succeed();
+ }
}
]);
</script>