Revert "Raise timeouts on smooth scroll layout tests".

third_party/WebKit/LayoutTests/resources/js-test.js

 // js-test now supports lazily printing test results which dumps all test
 // results once at the end of the test instead of building them up. To enable
 // this option, call setPrintTestResultsLazily() before running any tests.
 var _lazyTestResults; // Set by setPrintTestResultsLazily().
 var _lazyDescription; // Set by description() after setPrintTestResultsLazily().
 
 // 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 isJsTest = true;
 
 var description, debug, successfullyParsed, getOrCreateTestElement;
+
 var expectingError; // set by shouldHaveError()
 var expectedErrorMessage; // set by onerror when expectingError is true
 var unexpectedErrorMessage; // set by onerror when expectingError is not true
-var defaultTimeoutForShouldBecome = self.defaultTimeoutForShouldBecome || 500;
 
 (function() {
 
     getOrCreateTestElement = function(id, tagName)
     {
         var element = document.getElementById(id);
         if (element)
             return element;
 
         element = document.createElement(tagName);
@@ skipping 241 matching lines @@
     });
   }
 }
 
 function shouldBecomeEqual(_a, _b, _completionHandler, _timeout)
 {
   if (typeof _a != "string" || typeof _b != "string")
     debug("WARN: shouldBecomeEqual() expects string arguments");
 
   if (_timeout === undefined)
-    _timeout = defaultTimeoutForShouldBecome;
+    _timeout = 500;
 
   var _bv;
   var _condition = function() {
     var _exception;
     var _av;
     try {
       _av = eval(_a);
     } catch (e) {
         _exception = e;
     }
@@ skipping 112 matching lines @@
     }
   } else
     testFailed(_a + " should not be " + _bv + ".");
 }
 
 function shouldBecomeDifferent(_a, _b, _completionHandler, _timeout)
 {
   if (typeof _a != "string" || typeof _b != "string")
     debug("WARN: shouldBecomeDifferent() expects string arguments");
   if (_timeout === undefined)
-    _timeout = defaultTimeoutForShouldBecome;
+    _timeout = 500;
 
   var _bv;
   var _condition = function() {
     var _exception;
     var _av;
     try {
       _av = eval(_a);
     } catch (e) {
       _exception = e;
     }
@@ skipping 476 matching lines @@
     testPassed = function(msg) {
         workerPort.postMessage('PASS:' + msg);
     };
     finishJSTest = function() {
         workerPort.postMessage('DONE:');
     };
     debug = function(msg) {
         workerPort.postMessage(msg);
     };
 }