empty-urls.html needs to stop being flaky.
Because it was in http/tests/loading, it output
frame load callbacks, and it was unpredictable whether
the callback for onload or for the load completing would
be called first. Ergo, move the test to http/tests/misc,
and remove the logic which failed to enforce a frame load
callback ordering.
https://bugs.webkit.org/show_bug.cgi?id=67359

Reviewed by Adam Barth.

* http/tests/loading/empty-urls-expected.txt: Removed.
* http/tests/loading/empty-urls.html: Removed.
* http/tests/misc/empty-urls-expected.txt: Copied from LayoutTests/http/tests/loading/empty-urls-expected.txt.
* http/tests/misc/empty-urls.html: Copied from LayoutTests/http/tests/loading/empty-urls.html.
* platform/chromium/test_expectations.txt:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@98732 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index db649cd..f2c480e 100755
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,22 @@
+2011-10-28  Nate Chapin  <japhet@chromium.org>
+
+        empty-urls.html needs to stop being flaky.
+        Because it was in http/tests/loading, it output
+        frame load callbacks, and it was unpredictable whether
+        the callback for onload or for the load completing would
+        be called first. Ergo, move the test to http/tests/misc,
+        and remove the logic which failed to enforce a frame load
+        callback ordering.
+        https://bugs.webkit.org/show_bug.cgi?id=67359
+
+        Reviewed by Adam Barth.
+
+        * http/tests/loading/empty-urls-expected.txt: Removed.
+        * http/tests/loading/empty-urls.html: Removed.
+        * http/tests/misc/empty-urls-expected.txt: Copied from LayoutTests/http/tests/loading/empty-urls-expected.txt.
+        * http/tests/misc/empty-urls.html: Copied from LayoutTests/http/tests/loading/empty-urls.html.
+        * platform/chromium/test_expectations.txt:
+
 2011-10-28  Julien Chaffraix  <jchaffraix@webkit.org>
 
         Unreviewed gardening.
diff --git a/LayoutTests/http/tests/loading/empty-urls-expected.txt b/LayoutTests/http/tests/loading/empty-urls-expected.txt
deleted file mode 100644
index 0b5f1c2..0000000
--- a/LayoutTests/http/tests/loading/empty-urls-expected.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didFinishLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-PASS: img onerror fired
-PASS: input type=image onerror fired
-PASS: script onerror fired
-PASS: video src onerror fired
-PASS: audio onerror fired
-PASS: source onerror fired
-      
diff --git a/LayoutTests/http/tests/misc/empty-urls-expected.txt b/LayoutTests/http/tests/misc/empty-urls-expected.txt
new file mode 100644
index 0000000..a43904b
--- /dev/null
+++ b/LayoutTests/http/tests/misc/empty-urls-expected.txt
@@ -0,0 +1,7 @@
+PASS: img onerror fired
+PASS: input type=image onerror fired
+PASS: script onerror fired
+PASS: video src onerror fired
+PASS: audio onerror fired
+PASS: source onerror fired
+      
diff --git a/LayoutTests/http/tests/loading/empty-urls.html b/LayoutTests/http/tests/misc/empty-urls.html
similarity index 89%
rename from LayoutTests/http/tests/loading/empty-urls.html
rename to LayoutTests/http/tests/misc/empty-urls.html
index 5adc50c..8d45a6a 100644
--- a/LayoutTests/http/tests/loading/empty-urls.html
+++ b/LayoutTests/http/tests/misc/empty-urls.html
@@ -9,7 +9,6 @@
 var expectedPasses = 6;
 var messages = new Array();
 var currentMessageIndex = 0;
-var onloadFired = false;
 
 function log(message)
 {
@@ -27,12 +26,7 @@
     }
 
     expectedPasses--;
-    checkIfDone();
-}
-
-function checkIfDone()
-{
-    if (expectedPasses == 0 && onloadFired && window.layoutTestController)
+    if (expectedPasses == 0 && window.layoutTestController)
         layoutTestController.notifyDone();
 }
 </script>
@@ -40,7 +34,7 @@
 <link rel="prefetch" src="" href="" onerror="log('FAIL: link rel=prefetch onerror fired')"></link>
 <link rel="stylesheet" src="" href="" onerror="log('FAIL: link rel=stylesheet onerror fired')"></link>
 </head>
-<body onload="setTimeout('onloadFired = true; checkIfDone();', 0)">
+<body>
 <div id="console"></div>
 <command icon="" onerror="log('FAIL: command onerror fired')"></command>
 <object data="" onerror="log('FAIL: object onerror fired')"></object>
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 57ffc7a..cddc23a 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3642,8 +3642,6 @@
 // We don't seem to load this glyph on windows
 BUGJAMESR WIN : fast/text/fallback-traits-fixup.html = IMAGE+TEXT
 
-BUGWK67359 : http/tests/loading/empty-urls.html = PASS TEXT
-
 BUGWK67515 LINUX WIN : canvas/philip/tests/2d.shadow.canvas.alpha.html = TEXT
 
 BUGCR54348 LINUX RELEASE : http/tests/security/xssAuditor/dom-write-innerHTML.html = PASS TEXT