summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-23 13:46:04 +0000
committerbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-23 13:46:04 +0000
commit05b6ab4604df59e834091e413e802c10332ce93d (patch)
treef81fa26ccd05912167653abf9df29def130b412d /chrome/test
parent4894438bb73e0a3c22fec3f36204b1f97b8cb104 (diff)
downloadchromium_src-05b6ab4604df59e834091e413e802c10332ce93d.zip
chromium_src-05b6ab4604df59e834091e413e802c10332ce93d.tar.gz
chromium_src-05b6ab4604df59e834091e413e802c10332ce93d.tar.bz2
Implemented chrome.experimental.webRequest.onErrorOccurred
BUG=60101 TEST=execute browser_tests Review URL: http://codereview.chromium.org/6881104 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82794 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/data/extensions/api_test/webrequest/events/test.html36
1 files changed, 35 insertions, 1 deletions
diff --git a/chrome/test/data/extensions/api_test/webrequest/events/test.html b/chrome/test/data/extensions/api_test/webrequest/events/test.html
index 12ec1a3..c24cbc3 100644
--- a/chrome/test/data/extensions/api_test/webrequest/events/test.html
+++ b/chrome/test/data/extensions/api_test/webrequest/events/test.html
@@ -404,7 +404,15 @@ runTests([
url: getURL("complexLoad/a.html")
},
retval: {cancel: true}
- }
+ },
+ // Cancelling is considered an error.
+ { label: "onErrorOccurred",
+ event: "onErrorOccurred",
+ details: {
+ url: getURL("complexLoad/a.html"),
+ error: ""
+ }
+ },
],
[], // event order
{}, // filter
@@ -535,5 +543,31 @@ runTests([
navigateAndWait(getURL("complexLoad/a.html"));
});
},
+
+ // Navigates to a non-existing page.
+ function nonExistingLoad() {
+ expect(
+ [ // events
+ { label: "onBeforeRequest",
+ event: "onBeforeRequest",
+ details: {
+ method: "GET",
+ tabId: tabId,
+ type: "main_frame",
+ url: getURL("does_not_exist.html")
+ }
+ },
+ { label: "onErrorOccurred",
+ event: "onErrorOccurred",
+ details: {
+ url: getURL("does_not_exist.html"),
+ error: ""
+ }
+ },
+ ],
+ [ // event order
+ ["onBeforeRequest", "onErrorOccurred"] ]);
+ navigateAndWait(getURL("does_not_exist.html"));
+ },
]);
</script>