Merge setTimeout calls with same timeout for webfont tests.

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

Index: third_party/WebKit/LayoutTests/http/tests/webfont/font-display.html
diff --git a/third_party/WebKit/LayoutTests/http/tests/webfont/font-display.html b/third_party/WebKit/LayoutTests/http/tests/webfont/font-display.html
index ba9b97403855850dcf2cf798c7ea11ee39dd347f..ec19d7a86ef0c52ef1966b622bc97d8808bc31a6 100644
--- a/third_party/WebKit/LayoutTests/http/tests/webfont/font-display.html
+++ b/third_party/WebKit/LayoutTests/http/tests/webfont/font-display.html
@@ -60,11 +60,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>