summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/data
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-13 00:09:47 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-13 00:09:47 +0000
commitb40f8640305e66d937ba4df7cc6c6ae4aad6f141 (patch)
tree30457d27acd714080ac1ea9e01df040505feaea0 /chrome_frame/test/data
parentcfcc06ae4e543282647bb6ccb73bd333f3726f9a (diff)
downloadchromium_src-b40f8640305e66d937ba4df7cc6c6ae4aad6f141.zip
chromium_src-b40f8640305e66d937ba4df7cc6c6ae4aad6f141.tar.gz
chromium_src-b40f8640305e66d937ba4df7cc6c6ae4aad6f141.tar.bz2
Reverting this as a number of tests have been failing on all builders ever since. Please look into this and resubmit.
Revert 47065 - An attempt to catch unexpected script errors in html test pages in a more generic way. TEST=This is meant to help track down flakiness of a few tests. BUG=none Review URL: http://codereview.chromium.org/2052006 TBR=tommi@chromium.org Review URL: http://codereview.chromium.org/2011017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47099 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/data')
-rw-r--r--chrome_frame/test/data/chrome_frame_tester_helpers.js18
1 files changed, 4 insertions, 14 deletions
diff --git a/chrome_frame/test/data/chrome_frame_tester_helpers.js b/chrome_frame/test/data/chrome_frame_tester_helpers.js
index eefde47..a6cc9c2 100644
--- a/chrome_frame/test/data/chrome_frame_tester_helpers.js
+++ b/chrome_frame/test/data/chrome_frame_tester_helpers.js
@@ -1,17 +1,6 @@
//
// This script provides some mechanics for testing ChromeFrame
//
-
-var reportURL = "/writefile/";
-
-// Start by setting a default error handler.
-// Use onerror without any arguments due to webkit bugs 7771 and 8939.
-window.onerror = new function() {
- onFailure("tester_helpers", "script exception", window.location.href);
- return true;
-}
-
-
function onSuccess(name, id) {
appendStatus("Success reported!");
onFinished(name, id, "OK");
@@ -26,7 +15,7 @@ function byId(id) {
return document.getElementById(id);
}
-function getXHRObject() {
+function getXHRObject(){
var XMLHTTP_PROGIDS = ['Msxml2.XMLHTTP', 'Microsoft.XMLHTTP',
'Msxml2.XMLHTTP.4.0'];
var http = null;
@@ -51,6 +40,8 @@ function getXHRObject() {
return http;
}
+var reportURL = "/writefile/";
+
function shutdownServer() {
var xhr = getXHRObject();
if(!xhr)
@@ -76,8 +67,7 @@ function writeToServer(name, result) {
return;
// synchronously POST the results
- var target = reportURL + name;
- xhr.open("POST", target, false);
+ xhr.open("POST", reportURL + name, false);
xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
try {
xhr.send(result);