Unflaky test inspector/timeline/timeline-network-received-data.html

LayoutTests/inspector/timeline/timeline-network-received-data.html

Index: LayoutTests/inspector/timeline/timeline-network-received-data.html
diff --git a/LayoutTests/inspector/timeline/timeline-network-received-data.html b/LayoutTests/inspector/timeline/timeline-network-received-data.html
index 1bfb88a818b3f0eb432b4231acced78259488440..9dea941fdeb0924dfa7a8dd75109a7590d1e7ca7 100644
--- a/LayoutTests/inspector/timeline/timeline-network-received-data.html
+++ b/LayoutTests/inspector/timeline/timeline-network-received-data.html
@@ -4,20 +4,29 @@
 <script src="../../http/tests/inspector/timeline-test.js"></script>
 <script>
 
-var scriptUrl = "timeline-network-resource.js";
-
 function performActions() 
 {
     var image = new Image();
     image.src = "resources/anImage.png";
     var script = document.createElement("script");
-    script.src = scriptUrl;
+    script.src = "timeline-network-resource.js";
     document.body.appendChild(script);
 }
 
 function test()
 {
-    var scriptUrl = "timeline-network-resource.js";
+    var callbackBarrier = new CallbackBarrier();
+    var resourceReceivedCallback = callbackBarrier.createCallback();
+    // It will be called from timeline-network-resource.js script by evaluateInWebInspector call.
+    InspectorTest.scriptEvaluated = callbackBarrier.createCallback();
+    callbackBarrier.callWhenDone(done);
+
+    function done()
+    {
+        InspectorTest.addResult("Script evaluated.");
+        InspectorTest.addResult("Resource received data has length, test passed.");
+        InspectorTest.completeTest();
+    }
 
     var calledOnce;
 
@@ -35,8 +44,7 @@ function test()
                     if (property === "encodedDataLength") {
                         if (!calledOnce) {
                             calledOnce = true;
-                            InspectorTest.addResult("Resource received data has length, test passed.");
-                            InspectorTest.completeTest();
+                            resourceReceivedCallback();
                         }
                         return;
                     }