Refactor wait_util so it isn't coupled to EarlGrey.

ios/web/shell/test/earl_grey/shell_matchers.mm

Index: ios/web/shell/test/earl_grey/shell_matchers.mm
diff --git a/ios/web/shell/test/earl_grey/shell_matchers.mm b/ios/web/shell/test/earl_grey/shell_matchers.mm
index 5e71d586fcaf04b655d23df432dffb640bcbae79..965845d533238d29d89d6dacac945d40ac2c93d4 100644
--- a/ios/web/shell/test/earl_grey/shell_matchers.mm
+++ b/ios/web/shell/test/earl_grey/shell_matchers.mm
@@ -7,7 +7,7 @@
 #import "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #import "ios/testing/earl_grey/matchers.h"
-#include "ios/testing/earl_grey/wait_util.h"
+#include "ios/testing/wait_util.h"
 #import "ios/web/public/web_state/web_state.h"
 #import "ios/web/public/test/earl_grey/web_view_matchers.h"
 #import "ios/web/shell/test/app/web_shell_test_util.h"
@@ -43,9 +43,17 @@ id<GREYMatcher> addressFieldText(std::string text) {
       return NO;
     }
     UITextField* text_field = base::mac::ObjCCastStrict<UITextField>(view);
-    testing::WaitUntilCondition(testing::kWaitForUIElementTimeout, ^bool() {
-      return [text_field.text isEqualToString:base::SysUTF8ToNSString(text)];
-    });
+    NSString* errorMessage = [NSString
+        stringWithFormat:
+            @"Address field text did not match. expected: %@, actual: %@",
+            base::SysUTF8ToNSString(text), text_field.text];
+    GREYAssert(testing::WaitUntilConditionOrTimeout(
+                   testing::kWaitForUIElementTimeout,
+                   ^() {
+                     return [text_field.text
+                         isEqualToString:base::SysUTF8ToNSString(text)];
+                   }),
+               errorMessage);
     return YES;
   };