Update layout tests to work when smooth scrolling is enabled by default

third_party/WebKit/LayoutTests/fast/forms/suggestion-picker/week-suggestion-picker-mouse-operations.html

Index: third_party/WebKit/LayoutTests/fast/forms/suggestion-picker/week-suggestion-picker-mouse-operations.html
diff --git a/third_party/WebKit/LayoutTests/fast/forms/suggestion-picker/week-suggestion-picker-mouse-operations.html b/third_party/WebKit/LayoutTests/fast/forms/suggestion-picker/week-suggestion-picker-mouse-operations.html
index 41f27f6c7a39dc221b1e006168571618e7d66fc1..4d8b53aa2f34ca85c5ba4b294dd5937c3ed9ec77 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/suggestion-picker/week-suggestion-picker-mouse-operations.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/suggestion-picker/week-suggestion-picker-mouse-operations.html
@@ -115,25 +115,32 @@ function test1AfterClosing() {
 
 var scrollTopBeforeWheelEvent = 0;
 var scrollTopAfterWheelEvent = 0;
+var suggestionList;
 
 function test2() {
-    var suggestionList = popupWindow.document.getElementsByClassName('suggestion-list')[0];
+    suggestionList = popupWindow.document.getElementsByClassName("suggestion-list")[0];
 
     debug('Check that you can scroll using the mouse wheel.');
 
-    scrollTopBeforeWheelEvent = suggestionList.scrollTop;
-    dispatchWheelEvent(suggestionList, 0, -100);
-    scrollTopAfterWheelEvent = suggestionList.scrollTop;
-    shouldBeTrue('scrollTopBeforeWheelEvent < scrollTopAfterWheelEvent');
-
-    scrollTopBeforeWheelEvent = suggestionList.scrollTop;
-    dispatchWheelEvent(suggestionList, 0, 100);
-    scrollTopAfterWheelEvent = suggestionList.scrollTop;
-    shouldBeTrue('scrollTopBeforeWheelEvent > scrollTopAfterWheelEvent');
-
-    popupWindow.focus();
-    eventSender.keyDown('escape');
-    waitUntilClosing(test2AfterClosing);
+    function finishTest() {
+        popupWindow.focus();
+        eventSender.keyDown('escape');
+        waitUntilClosing(test2AfterClosing);
+    }
+
+    function scrollUp() {
+        scrollTopBeforeWheelEvent = suggestionList.scrollTop;
+        dispatchWheelEvent(suggestionList, 0, 100);
+        shouldBecomeEqual('scrollTopBeforeWheelEvent > suggestionList.scrollTop', 'true', finishTest)
+    }
+
+    function scrollDown() {
+        scrollTopBeforeWheelEvent = suggestionList.scrollTop;
+        dispatchWheelEvent(suggestionList, 0, -100);
+        shouldBecomeEqual('scrollTopBeforeWheelEvent < suggestionList.scrollTop', 'true', scrollUp);
+    }
+
+    scrollDown();
 }
 
 function test2AfterClosing() {