Refactor wait_util so it isn't coupled to EarlGrey.

ios/web/public/test/earl_grey/web_view_actions.mm

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/web/public/test/earl_grey/web_view_actions.h"
 
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/mac/bind_objc_block.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/ios/wait_util.h"
 #include "base/values.h"
-#import "ios/testing/earl_grey/wait_util.h"
+#import "ios/testing/wait_util.h"
 #import "ios/web/public/test/earl_grey/web_view_matchers.h"
 #import "ios/web/public/test/web_view_interaction_test_util.h"
 #import "ios/web/web_state/web_state_impl.h"
 
 using web::test::ExecuteJavaScript;
 
 namespace {
 
 // Long press duration to trigger context menu.
 const NSTimeInterval kContextMenuLongPressDuration = 0.3;
@@ skipping 31 matching lines @@
       "      __gCrWeb.message.invokeOnHost("
       // Second template param: callback command.
       "          {'command' : '%2$s' });"
       "  }, options);"
       "  return true;"
       "})();";
 
   const std::string kAddVerifierScript =
       base::StringPrintf(kAddInteractionVerifierScriptTemplate,
                          element_id.c_str(), kCallbackInvocation.c_str());
-  NSDate* deadline =
-      [NSDate dateWithTimeIntervalSinceNow:testing::kWaitForUIElementTimeout];
-  bool verifier_added = false;
-  while (([[NSDate date] compare:deadline] != NSOrderedDescending) &&
-         !verifier_added) {
-    std::unique_ptr<base::Value> value =
-        web::test::ExecuteJavaScript(web_state, kAddVerifierScript);
-    if (value) {
-      std::string error;
-      if (value->GetAsString(&error)) {
-        DLOG(ERROR) << "Verifier injection failed: " << error << ", retrying.";
-      } else if (value->GetAsBoolean(&verifier_added)) {
-        verifier_added = true;
-      }
-    }
-    base::test::ios::SpinRunLoopWithMaxDelay(
-        base::TimeDelta::FromSecondsD(testing::kSpinDelaySeconds));
-  }
 
-  if (!verifier_added)
+  bool success = testing::WaitUntilConditionOrTimeout(
+      testing::kWaitForUIElementTimeout, ^bool() {
+        bool verifier_added = false;
+        std::unique_ptr<base::Value> value =
+            web::test::ExecuteJavaScript(web_state, kAddVerifierScript);
+        if (value) {
+          std::string error;
+          if (value->GetAsString(&error)) {
+            DLOG(ERROR) << "Verifier injection failed: " << error
+                        << ", retrying.";
+          } else if (value->GetAsBoolean(&verifier_added)) {
+            return true;
+          }
+        }
+        return false;
+      });
+
+  if (!success)
     return false;
 
   // The callback doesn't care about any of the parameters, just whether it is
   // called or not.
   auto callback = base::BindBlock(^bool(const base::DictionaryValue& /* json */,
                                         const GURL& /* origin_url */,
                                         bool /* user_is_interacting */) {
     *verified = true;
     return true;
   });
@@ skipping 73 matching lines @@
 
     if (*error) {
       return NO;
     }
 
     // Wait for the verified to trigger and set |verified|.
     NSString* verification_timeout_message =
         [NSString stringWithFormat:@"The action (%@) on element_id %s wasn't "
                                    @"verified before timing out.",
                                    action.name, element_id.c_str()];
-    testing::WaitUntilCondition(testing::kWaitForJSCompletionTimeout,
-                                verification_timeout_message, ^{
-                                  return verified;
-                                });
+    GREYAssert(testing::WaitUntilConditionOrTimeout(
+                   testing::kWaitForJSCompletionTimeout,
+                   ^{
+                     return verified;
+                   }),
+               verification_timeout_message);
 
     // If |verified| is not true, the wait condition should have already exited
     // this control flow, so sanity check that it has in fact been set to
     // true by this point.
     DCHECK(verified);
     return YES;
   };
 
   return [GREYActionBlock actionWithName:action_name
                              constraints:webViewInWebState(state)
@@ skipping 20 matching lines @@
 id<GREYAction> webViewTapElement(WebState* state,
                                  const std::string& element_id) {
   CGRect rect = web::test::GetBoundingRectOfElementWithId(state, element_id);
   CGPoint point = CGPointMake(CGRectGetMidX(rect), CGRectGetMidY(rect));
   return CGRectIsEmpty(rect) ? webViewElementNotFound(element_id)
                              : webViewVerifiedActionOnElement(
                                    state, grey_tapAtPoint(point), element_id);
 }
 
 }  // namespace web