Refactor wait_util so it isn't coupled to EarlGrey.

ios/testing/wait_util.h

 // 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.
 
-#ifndef IOS_TESTING_EARL_GREY_WAIT_UTIL_H_
-#define IOS_TESTING_EARL_GREY_WAIT_UTIL_H_
+#ifndef IOS_TESTING_WAIT_UTIL_H_
+#define IOS_TESTING_WAIT_UTIL_H_
 

[Eugene But (OOO till 7-30), 2016/10/25 14:43:38]

This is now third wait_util file. And WaitUntilConditionOrTimeout conceptually
is not very different from functions inside base/test/ios/wait_util. Should the
function be in base instead and constants in a separate file?

[baxley, 2016/10/25 18:50:04]

I have a bug to delete the one in ios/testing/earlgrey, which will happen after
this lands and we remove its use downstream

We'd rather not add this code to base, since we don't want to encourage using
WaitUntilCondition. :)

I filed crbug.com/659208, as a follow up where we should fix this. Hopefully we
can remove the waits, but if not we can then consolidate them. WDYT?

 #import <Foundation/Foundation.h>
 
 namespace testing {
 
 // Constant for UI wait loop in seconds.
 extern const NSTimeInterval kSpinDelaySeconds;
 
 // Constant for timeout in seconds while waiting for UI element.
 extern const NSTimeInterval kWaitForUIElementTimeout;
 
 // Constant for timeout in seconds while waiting for JavaScript completion.
 extern const NSTimeInterval kWaitForJSCompletionTimeout;
 
 // Constant for timeout in seconds while waiting for a download to complete.
 extern const NSTimeInterval kWaitForDownloadTimeout;
 
-// Waits until |condition| is true, or induces GREYAssert after |timeout|.
-void WaitUntilCondition(NSTimeInterval timeout, bool (^condition)(void));
-
-// Waits until |condition| is true, or induces GREYAssert after |timeout| with
-// |timeoutDescription| error message.
-void WaitUntilCondition(NSTimeInterval timeout,
-                        NSString* timeoutDescription,
-                        bool (^condition)(void));
+// Returns true when condition() becomes true, otherwise returns false after
+// |timeout|.
+bool WaitUntilConditionOrTimeout(NSTimeInterval timeout,

[Eugene But (OOO till 7-30), 2016/10/25 14:43:38]

Should we use Chromium types instead (base::TimeDelta)?

[baxley, 2016/10/25 18:50:04]

This adds complexity, since the caller has to create and pass in an object, when
all cases just want to pass in a time interval. I think it would be better to
change, if we moved it to base.

If you feel strongly, I can keep the API as is, but use a timer and create
TimeDelta based on the value passed in.

+                                 bool (^condition)(void));

[Eugene But (OOO till 7-30), 2016/10/25 14:43:38]

Should this be ConditionBlock from block_types.h?

[baxley, 2016/10/25 18:50:04]

Done.

 
 }  // namespace testing
 
-#endif  // IOS_TESTING_EARL_GREY_WAIT_UTIL_H_
+#endif  // IOS_TESTING_WAIT_UTIL_H_