Remove deprecated wait_util methods.

BUG=579264

Review-Url: https://codereview.chromium.org/2616843002
Cr-Commit-Position: refs/heads/master@{#442940}

base/test/ios/wait_util.h

@@ -9,9 +9,6 @@
 #include "base/time/time.h"
 
 namespace base {
-
-class MessageLoop;
-
 namespace test {
 namespace ios {
 
@@ -43,19 +40,6 @@ void SpinRunLoopWithMaxDelay(TimeDelta max_delay);
 // elapsed.
 void SpinRunLoopWithMinDelay(TimeDelta min_delay);
 
-// Deprecated.
-// TODO(fdoray): Remove this once call have been removed from ios_internal.
-TimeDelta TimeUntilCondition(ProceduralBlock action,
-                             ConditionBlock condition,
-                             MessageLoop* message_loop,
-                             TimeDelta timeout);
-
-// Deprecated.
-// TODO(fdoray): Remove this once call have been removed from ios_internal.
-void WaitUntilCondition(ConditionBlock condition,
-                        MessageLoop* message_loop,
-                        TimeDelta timeout);
-
 }  // namespace ios
 }  // namespace test
 }  // namespace base

base/test/ios/wait_util.mm

@@ -48,7 +48,7 @@ void WaitUntilCondition(ConditionBlock condition,
 }
 
 void WaitUntilCondition(ConditionBlock condition) {
-  WaitUntilCondition(condition, nullptr, TimeDelta());
+  WaitUntilCondition(condition, false, TimeDelta());
 }
 
 void SpinRunLoopWithMaxDelay(TimeDelta max_delay) {
@@ -65,20 +65,6 @@ void SpinRunLoopWithMinDelay(TimeDelta min_delay) {
   }
 }
 
-TimeDelta TimeUntilCondition(ProceduralBlock action,
-                             ConditionBlock condition,
-                             MessageLoop* message_loop,
-                             TimeDelta timeout) {
-  return TimeUntilCondition(action, condition, message_loop != nullptr,
-                            timeout);
-}
-
-void WaitUntilCondition(ConditionBlock condition,
-                        MessageLoop* message_loop,
-                        TimeDelta timeout) {
-  WaitUntilCondition(condition, message_loop != nullptr, timeout);
-}
-
 }  // namespace ios
 }  // namespace test
 }  // namespace base

ios/chrome/browser/ui/contextual_search/touch_to_search_permissions_mediator_unittest.mm

@@ -363,7 +363,7 @@ TEST_F(TouchToSearchPermissionsMediatorTest, AudienceNotifications) {
       ^bool(void) {
         return [audience updated];
       },
-      nullptr, delay);
+      false, delay);
   EXPECT_TRUE([audience updated]);
   // Reset |audience|.
   [audience setUpdated:NO];
@@ -410,7 +410,7 @@ TEST_F(TouchToSearchPermissionsMediatorTest, AudienceNotifications) {
       ^bool(void) {
         return [audience updated];
       },
-      nullptr, delay);
+      false, delay);
   EXPECT_TRUE([audience updated]);
   // Reset |audience|.
   [audience setUpdated:NO];
@@ -443,7 +443,7 @@ TEST_F(TouchToSearchPermissionsMediatorTest, AudienceNotifications) {
       ^bool(void) {
         return [audience2 updated];
       },
-      nullptr, delay);
+      false, delay);
   EXPECT_TRUE([audience2 updated]);
 }
 

ios/chrome/browser/ui/ntp/new_tab_page_perftest.mm

@@ -38,7 +38,7 @@ class NewTabPagePerfTest : public PerfTestWithBVC {
   }
   void SettleUI() {
     base::test::ios::WaitUntilCondition(
-        nil, nullptr, base::TimeDelta::FromSecondsD(kMaxUICatchupDelay));
+        nil, false, base::TimeDelta::FromSecondsD(kMaxUICatchupDelay));
   }
 };
 

ios/chrome/browser/ui/omnibox_perftest.mm

@@ -159,7 +159,7 @@ class OmniboxPerfTest : public PerfTest {
         ^bool() {
           return [keyboard_listener_ isKeyboardVisible];
         },
-        nullptr, base::TimeDelta());
+        false, base::TimeDelta());
     base::test::ios::TimeUntilCondition(
         ^{
           [textField resignFirstResponder];
@@ -167,7 +167,7 @@ class OmniboxPerfTest : public PerfTest {
         ^bool() {
           return ![keyboard_listener_ isKeyboardVisible];
         },
-        nullptr, base::TimeDelta());
+        false, base::TimeDelta());
     [textField removeFromSuperview];
     return elapsed;
   }
@@ -182,7 +182,7 @@ class OmniboxPerfTest : public PerfTest {
         ^bool() {
           return [keyboard_listener_ isKeyboardVisible];
         },
-        nullptr, base::TimeDelta());
+        false, base::TimeDelta());
   }
 
   // Performs necessary cleanup (so next pass of unit test can start from
@@ -197,7 +197,7 @@ class OmniboxPerfTest : public PerfTest {
         ^bool() {
           return ![keyboard_listener_ isKeyboardVisible];
         },
-        nullptr, base::TimeDelta());
+        false, base::TimeDelta());
   }
 
   std::unique_ptr<TestChromeBrowserState> chrome_browser_state_;

ios/chrome/browser/ui/stack_view/stack_view_controller_perftest.mm

@@ -257,9 +257,9 @@ void StackViewControllerPerfTest::WaitForPageLoad(Tab* tab) {
       ^bool() {
         return !tab.webState->IsLoading();
       },
-      nullptr, base::TimeDelta::FromSecondsD(kMaxPageLoadDelay));
+      false, base::TimeDelta::FromSecondsD(kMaxPageLoadDelay));
   base::test::ios::WaitUntilCondition(
-      nil, nullptr, base::TimeDelta::FromSecondsD(kMaxUICatchupDelay));
+      nil, false, base::TimeDelta::FromSecondsD(kMaxUICatchupDelay));
 }
 
 base::TimeDelta StackViewControllerPerfTest::OpenStackView() {
@@ -271,7 +271,7 @@ base::TimeDelta StackViewControllerPerfTest::OpenStackView() {
       ^bool() {
         return [delegate_ showAnimationEnded];
       },
-      nullptr, base::TimeDelta::FromSecondsD(kTotalSpinDelay));
+      false, base::TimeDelta::FromSecondsD(kTotalSpinDelay));
 }
 
 void StackViewControllerPerfTest::MainControllerShowTabSwitcher() {
@@ -326,7 +326,7 @@ base::TimeDelta StackViewControllerPerfTest::CloseStackView() {
       ^bool() {
         return [delegate_ dismissAnimationEnded];
       },
-      nullptr, base::TimeDelta::FromSecondsD(kTotalSpinDelay));
+      false, base::TimeDelta::FromSecondsD(kTotalSpinDelay));
 
   [view_controller_ dismissViewControllerAnimated:NO completion:nil];
   if (!reuse_svc_)
@@ -338,7 +338,7 @@ base::TimeDelta StackViewControllerPerfTest::CloseStackView() {
   // in the OS during view teardown to resolve, so that the view gets its
   // dismissal callbacks.
   base::test::ios::WaitUntilCondition(
-      nil, nullptr, base::TimeDelta::FromSecondsD(kSpinDelay));
+      nil, false, base::TimeDelta::FromSecondsD(kSpinDelay));
 
   return closeTime;
 }

ios/web/public/test/web_test_with_web_state.mm

@@ -113,9 +113,7 @@ void WebTestWithWebState::WaitForBackgroundTasks() {
 }
 
 void WebTestWithWebState::WaitForCondition(ConditionBlock condition) {
-  base::MessageLoop* messageLoop = base::MessageLoop::current();
-  DCHECK(messageLoop);
-  base::test::ios::WaitUntilCondition(condition, messageLoop,
+  base::test::ios::WaitUntilCondition(condition, true,
                                       base::TimeDelta::FromSeconds(10));
 }