diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 18:23:41 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 18:23:41 +0000 |
| commit | c87b2881458763fb9d82066bbfd2fe696431e2db (patch) | |
| tree | f5a4acbbddf3632a6c1117ad8baea5088603e1be /chrome/test | |
| parent | 827ccbbcbbbbf0e26c12877268e00e53d505c8e4 (diff) | |
| download | chromium_src-c87b2881458763fb9d82066bbfd2fe696431e2db.zip chromium_src-c87b2881458763fb9d82066bbfd2fe696431e2db.tar.gz chromium_src-c87b2881458763fb9d82066bbfd2fe696431e2db.tar.bz2 | |
Revert 42631 as it seems to have broken browser tests on linux_views.
TBR=rafaelw@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42644 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
6 files changed, 0 insertions, 84 deletions
diff --git a/chrome/test/data/extensions/api_test/notifications/has_not_permission/background.html b/chrome/test/data/extensions/api_test/notifications/has_not_permission/background.html deleted file mode 100644 index f9e23d4b..0000000 --- a/chrome/test/data/extensions/api_test/notifications/has_not_permission/background.html +++ /dev/null @@ -1,20 +0,0 @@ -<script> -chrome.test.runTests([ - function hasPermission() { - chrome.test.assertEq(1, // permission not allowed - webkitNotifications.checkPermission()); - chrome.test.succeed(); - }, - function showNotification() { - try { - window.webkitNotifications.createHTMLNotification( - chrome.extension.getURL("notification.html")).show(); - } catch (e) { - chrome.test.assertTrue(e.message.indexOf("SECURITY_ERR") == 0); - chrome.test.succeed(); - return; - } - chrome.test.fail("Expected access denied error."); - } -]); -</script> diff --git a/chrome/test/data/extensions/api_test/notifications/has_not_permission/manifest.json b/chrome/test/data/extensions/api_test/notifications/has_not_permission/manifest.json deleted file mode 100644 index 4f7ed68..0000000 --- a/chrome/test/data/extensions/api_test/notifications/has_not_permission/manifest.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "notifications test", - "version": "1", - "permissions": [ "tabs" ], - "background_page": "background.html" -} diff --git a/chrome/test/data/extensions/api_test/notifications/has_not_permission/notification.html b/chrome/test/data/extensions/api_test/notifications/has_not_permission/notification.html deleted file mode 100644 index 77cf46f..0000000 --- a/chrome/test/data/extensions/api_test/notifications/has_not_permission/notification.html +++ /dev/null @@ -1,3 +0,0 @@ -<html> -Why hello there. -</html> diff --git a/chrome/test/data/extensions/api_test/notifications/has_permission/background.html b/chrome/test/data/extensions/api_test/notifications/has_permission/background.html deleted file mode 100644 index 4b43004..0000000 --- a/chrome/test/data/extensions/api_test/notifications/has_permission/background.html +++ /dev/null @@ -1,37 +0,0 @@ -<script> -var notification = null; - -// Shows the notification window using the specified URL. -// Control continues at onNotificationDone(). -function showNotification(url) { - notification = window.webkitNotifications.createHTMLNotification(url); - notification.onerror = function() { - chrome.test.fail("Failed to show notification."); - }; - notification.show(); -} - -// Called by the notification when it is done with its tests. -function onNotificationDone() { - var views = chrome.extension.getViews(); - chrome.test.assertEq(2, views.length); - notification.cancel(); - chrome.test.succeed(); -} - -chrome.test.runTests([ - function hasPermission() { - chrome.test.assertEq(0, // allowed - webkitNotifications.checkPermission()); - chrome.test.succeed(); - }, - function absoluteURL() { - showNotification(chrome.extension.getURL("notification.html")); - }, - function relativeURL() { - // TODO(aa): Relative URLs don't work for some reason. - // BUG: http://crbug.com/39216 - chrome.test.succeed(); - } -]); -</script> diff --git a/chrome/test/data/extensions/api_test/notifications/has_permission/manifest.json b/chrome/test/data/extensions/api_test/notifications/has_permission/manifest.json deleted file mode 100644 index a2fa64f..0000000 --- a/chrome/test/data/extensions/api_test/notifications/has_permission/manifest.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "notifications test", - "version": "1", - "permissions": [ "notifications", "tabs" ], - "background_page": "background.html" -} diff --git a/chrome/test/data/extensions/api_test/notifications/has_permission/notification.html b/chrome/test/data/extensions/api_test/notifications/has_permission/notification.html deleted file mode 100644 index 8a78703..0000000 --- a/chrome/test/data/extensions/api_test/notifications/has_permission/notification.html +++ /dev/null @@ -1,12 +0,0 @@ -<html> -<script> -// Test that we can call the tabs API. We don't care what the result is; tabs -// are tested elsewhere. We just care that we can call it without a -// permissions error. -chrome.windows.getAll(null, function() { - chrome.test.assertNoLastError(); - chrome.extension.getBackgroundPage().onNotificationDone(); -}); -</script> -Why hello there. -</html> |