Fix flaky NewTabPageTestCase.testOmnibox

ios/chrome/browser/ui/ntp/new_tab_page_egtest.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 <EarlGrey/EarlGrey.h>
 #import <XCTest/XCTest.h>
 
 #include "components/strings/grit/components_strings.h"
 #import "ios/chrome/browser/ui/commands/generic_chrome_command.h"
 #include "ios/chrome/browser/ui/commands/ios_command_ids.h"
@@ skipping 10 matching lines @@
 #include "ui/base/l10n/l10n_util.h"
 
 @implementation NewTabPageController (ExposedForTesting)
 - (GoogleLandingController*)googleLandingController {
   return googleLandingController_;
 }
 @end
 
 @interface GoogleLandingController (ExposedForTesting)
 - (BOOL)scrolledToTop;
+- (BOOL)animateHeader;
 @end
 
 namespace {
 
 void DismissNewTabPagePanel() {
   if (!IsIPadIdiom()) {
     id<GREYMatcher> matcher = grey_allOf(grey_accessibilityID(@"Exit"),
                                          grey_sufficientlyVisible(), nil);
     [[EarlGrey selectElementWithMatcher:matcher] performAction:grey_tap()];
   }
@@ skipping 38 matching lines @@
   }
   [[GREYUIThreadExecutor sharedInstance] drainUntilIdle];
 }
 
 void AssertNTPScrolledToTop(bool scrolledToTop) {
   [[GREYUIThreadExecutor sharedInstance] drainUntilIdle];
   NewTabPageController* ntp_controller =
       chrome_test_util::GetCurrentNewTabPageController();
   GoogleLandingController* google_landing_controller =
       [ntp_controller googleLandingController];
+  [[GREYCondition
+      conditionWithName:@"Wait for end of animation."
+                  block:^BOOL {
+                    return ![google_landing_controller animateHeader];
+                  }] waitWithTimeout:testing::kWaitForUIElementTimeout];
   GREYAssertTrue([google_landing_controller scrolledToTop] == scrolledToTop,
                  @"scrolledToTop_ does not match expected value");
 }
 
 }  // namespace
 
 @interface UIWindow (Hidden)
 - (UIResponder*)firstResponder;
 @end
 
@@ skipping 201 matching lines @@
   AssertNTPScrolledToTop(YES);
 
   // Check that tab switcher and tools menu buttons are not on screen.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityLabel(tabSwitcherLabel)]
       assertWithMatcher:grey_notVisible()];
   [[EarlGrey selectElementWithMatcher:grey_accessibilityLabel(toolsMenuLabel)]
       assertWithMatcher:grey_notVisible()];
 }
 
 @end