Update Fullscreen EarlGrey test timeouts for iOS 13

Increase the wait time to use standard constants for JS and UI waits.
The tests previously used a custom timeout of one second which is too
short to detect the change on iOS 13.

Bug: 983355
Change-Id: Iec4fb542aa5fc9094651c45e7d20a4680a901570
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1717232
Commit-Queue: Mike Dougherty <michaeldo@chromium.org>
Commit-Queue: Kurt Horimoto <kkhorimoto@chromium.org>
Auto-Submit: Mike Dougherty <michaeldo@chromium.org>
Reviewed-by: Eugene But <eugenebut@chromium.org>
Reviewed-by: Kurt Horimoto <kkhorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#680588}

ios/chrome/browser/ui/fullscreen/fullscreen_egtest.mm

@@ -32,6 +32,10 @@
 #error "This file requires ARC support."
 #endif
 
+using base::test::ios::kWaitForPageLoadTimeout;
+using base::test::ios::kWaitForJSCompletionTimeout;
+using base::test::ios::WaitUntilConditionOrTimeout;
+
 namespace {
 
 // The page height of test pages. This must be big enough to triger fullscreen.
@@ -59,7 +63,7 @@ void AssertURLIs(const GURL& expectedURL) {
                     error:&error];
     return (error == nil);
   };
-  GREYAssert(base::test::ios::WaitUntilConditionOrTimeout(1.0, condition),
+  GREYAssert(WaitUntilConditionOrTimeout(kWaitForPageLoadTimeout, condition),
              description);
 }
 
@@ -207,10 +211,10 @@ void AssertURLIs(const GURL& expectedURL) {
         finished = true;
       }));
 
-  GREYAssert(base::test::ios::WaitUntilConditionOrTimeout(1.0,
-                                                          ^{
-                                                            return finished;
-                                                          }),
+  GREYAssert(WaitUntilConditionOrTimeout(kWaitForJSCompletionTimeout,
+                                         ^{
+                                           return finished;
+                                         }),
              @"JavaScript to hide the toolbar did not complete");
 
   // Scroll up to be sure the toolbar can be dismissed by scrolling down.

ios/chrome/test/earl_grey/chrome_earl_grey_ui.mm

@@ -30,6 +30,7 @@ using chrome_test_util::ClearBrowsingDataView;
 using chrome_test_util::ConfirmClearBrowsingDataButton;
 using chrome_test_util::SettingsMenuButton;
 using chrome_test_util::ToolsMenuView;
+using base::test::ios::kWaitForUIElementTimeout;
 using base::test::ios::WaitUntilConditionOrTimeout;
 
 namespace {
@@ -217,7 +218,6 @@ bool IsAppCompactWidth() {
 }
 
 - (void)waitForToolbarVisible:(BOOL)isVisible {
-  const NSTimeInterval kWaitForToolbarAnimationTimeout = 1.0;
   ConditionBlock condition = ^{
     NSError* error = nil;
     id<GREYMatcher> visibleMatcher = isVisible ? grey_notNil() : grey_nil();
@@ -230,7 +230,7 @@ bool IsAppCompactWidth() {
       isVisible ? @"Toolbar was not visible" : @"Toolbar was visible";
 
   bool toolbarVisibility = base::test::ios::WaitUntilConditionOrTimeout(
-      kWaitForToolbarAnimationTimeout, condition);
+      kWaitForUIElementTimeout, condition);
   EG_TEST_HELPER_ASSERT_TRUE(toolbarVisibility, errorMessage);
 }