Merge setTimeout calls with same timeout for webfont tests.

third_party/WebKit/LayoutTests/http/tests/webfont/font-display-intervention.html

Index: third_party/WebKit/LayoutTests/http/tests/webfont/font-display-intervention.html
diff --git a/third_party/WebKit/LayoutTests/http/tests/webfont/font-display-intervention.html b/third_party/WebKit/LayoutTests/http/tests/webfont/font-display-intervention.html
index 42e20f18e350edfb2ba00cf504d808840f95ad7b..08df4158cf9bf17b8029eb8dd763b0c1c115ab94 100644
--- a/third_party/WebKit/LayoutTests/http/tests/webfont/font-display-intervention.html
+++ b/third_party/WebKit/LayoutTests/http/tests/webfont/font-display-intervention.html
@@ -71,11 +71,16 @@ window.onload = function() {
             tr.appendChild(td);
         }
         table.appendChild(tr);
-        setTimeout((function(tr){tr.classList.remove('hidden')}).bind(null, tr), maxTime - config.time);
+        if (config.time == 0) {
+            setTimeout((function(tr){
+                tr.classList.remove('hidden');
+                if (window.testRunner)
+                    testRunner.notifyDone();
+            }).bind(null, tr), maxTime);
+        } else {
+            setTimeout((function(tr){tr.classList.remove('hidden')}).bind(null, tr), maxTime - config.time);
+        }
     }
-
-    if (window.testRunner)
-        setTimeout(function() { testRunner.notifyDone(); }, maxTime);
 }
 
 </script>