Use WaitUntilConditionOrTimeout in CRWWebControllerPageScrollStateTest.

WaitUntilConditionOrTimeout replaces deprecated WaitUntilCondition.

Bug: 784735
Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs
Change-Id: I7be4ef5e89e72e2bdee8721a6be7fcaba96107a8
Reviewed-on: https://chromium-review.googlesource.com/1214425
Commit-Queue: Kurt Horimoto <kkhorimoto@chromium.org>
Reviewed-by: Kurt Horimoto <kkhorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#589986}

ios/web/web_state/ui/crw_web_controller_unittest.mm

@@ -538,9 +538,9 @@ TEST_P(CRWWebControllerPageScrollStateTest,
   [web_controller() restoreStateFromHistory];
 
   // |-restoreStateFromHistory| is async; wait for its completion.
-  base::test::ios::WaitUntilCondition(^bool() {
+  ASSERT_TRUE(WaitUntilConditionOrTimeout(kWaitForPageLoadTimeout, ^{
     return web_controller().pageDisplayState.scroll_state().offset_x() == 1.0;
-  });
+  }));
 
   ASSERT_EQ(original_zoom_state,
             web_controller().pageDisplayState.zoom_state());
@@ -568,9 +568,9 @@ TEST_P(CRWWebControllerPageScrollStateTest,
   [web_controller() restoreStateFromHistory];
 
   // |-restoreStateFromHistory| is async; wait for its completion.
-  base::test::ios::WaitUntilCondition(^bool() {
+  ASSERT_TRUE(WaitUntilConditionOrTimeout(kWaitForPageLoadTimeout, ^{
     return web_controller().pageDisplayState.scroll_state().offset_x() == 1.0;
-  });
+  }));
 
   PageZoomState final_zoom_state =
       web_controller().pageDisplayState.zoom_state();