Partial revert of r161493.

LayoutTests/resources/js-test.js

 // svg/dynamic-updates tests set enablePixelTesting=true, as we want to dump text + pixel results
 if (self.testRunner) {
     if (self.enablePixelTesting)
         testRunner.dumpAsTextWithPixelResults();
     else
         testRunner.dumpAsText();
 }
 
 var description, debug, successfullyParsed, errorMessage;
 
@@ skipping 55 matching lines @@
             "font-family: monospace;" +
         "}";
 
     function insertStyleSheet()
     {
         var styleElement = document.createElement("style");
         styleElement.textContent = css;
         (document.head || document.documentElement).appendChild(styleElement);
     }
 
-    function setupFinishHandler()
+    function handleTestFinished()
     {
-        wasFinishHandlerSetup = true;
+        // FIXME: Get rid of this boolean.
+        wasPostTestScriptParsed = true;
         if (window.jsTestIsAsync) {
             if (window.testRunner)
                 testRunner.waitUntilDone();
             if (window.wasFinishJSTestCalled)
                 finishJSTest();
-        } else {
-            // Some tests override the window prototype.
-            if (window.addEventListener)
-                window.addEventListener('load', finishJSTest, false);
-            else
-                finishJSTest();
-        }
+        } else
+            finishJSTest();
     }
 
     if (!isWorker()) {
-        // FIXME: Move this to be on the load event so that tests can set jsTestIsAsync after DOMContentLoaded.
-        window.addEventListener('DOMContentLoaded', setupFinishHandler, false);
+        window.addEventListener('DOMContentLoaded', handleTestFinished, false);
         insertStyleSheet();
     }
 
     if (!self.isOnErrorTest) {
         self.onerror = function(message)
         {
             errorMessage = message;
         };
     }
 })();
@@ skipping 486 matching lines @@
 function minorGC() {
     if (typeof GCController !== "undefined")
         GCController.minorCollect();
     else
         testFailed("Minor GC is available only when you enable the --expose-gc option in V8.");
 }
 
 function isSuccessfullyParsed()
 {
     // FIXME: Remove this and only report unexpected syntax errors.
-    successfullyParsed = !errorMessage;
+    if (!errorMessage)
+        successfullyParsed = true;
     shouldBeTrue("successfullyParsed");
     debug('<br /><span class="pass">TEST COMPLETE</span>');
 }
 
 // It's possible for an async test to call finishJSTest() before js-test-post.js
 // has been parsed.
 function finishJSTest()
 {
     wasFinishJSTestCalled = true;
-    if (!self.wasFinishHandlerSetup)
+    if (!self.wasPostTestScriptParsed)
         return;
     isSuccessfullyParsed();
     if (self.jsTestIsAsync && self.testRunner)
         testRunner.notifyDone();
 }
 
 function startWorker(testScriptURL, shared)
 {
     self.jsTestIsAsync = true;
     debug('Starting worker: ' + testScriptURL);
@@ skipping 66 matching lines @@
     testPassed = function(msg) {
         workerPort.postMessage('PASS:' + msg);
     }
     finishJSTest = function() {
         workerPort.postMessage('DONE:');
     }
     debug = function(msg) {
         workerPort.postMessage(msg);
     }
 }