Fix testHistoryForwardNavigation.

ios/chrome/browser/web/navigation_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 <XCTest/XCTest.h>
 
 #include "base/ios/ios_util.h"
 #include "components/strings/grit/components_strings.h"
 #include "ios/chrome/test/app/web_view_interaction_test_util.h"
 #import "ios/chrome/test/earl_grey/chrome_earl_grey.h"
@@ skipping 40 matching lines @@
 // Button ids for history_go.html.
 NSString* const kGoNoParameterID = @"go-no-parameter";
 NSString* const kGoZeroID = @"go-zero";
 NSString* const kGoTwoID = @"go-2";
 NSString* const kGoBackTwoID = @"go-back-2";
 
 // URLs and labels for tests that navigate back and forward.
 const char kBackHTMLButtonLabel[] = "BackHTMLButton";
 const char kForwardHTMLButtonLabel[] = "ForwardHTMLButton";
 const char kForwardHTMLSentinel[] = "Forward page loaded";
+const char kTestPageSentinel[] = "Test Page";
 const char kBackURL[] = "http://back";
 const char kForwardURL[] = "http://forward";
 const char kTestURL[] = "http://test";
 
 // URLs and labels for scenarioWindowLocation* tests.
 const char kHashChangeWithHistoryLabel[] = "hashChangedWithHistory";
 const char kHashChangeWithoutHistoryLabel[] = "hashChangedWithoutHistory";
 const char kPage1URL[] = "http://page1";
 const char kHashChangedWithHistoryURL[] =
     "http://page1/#hashChangedWithHistory";
@@ skipping 300 matching lines @@
   // Tap the forward button in the toolbar and verify the second URL is loaded.
   [[EarlGrey selectElementWithMatcher:forwardButton()]
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:chrome_test_util::omniboxText(
                                           secondURL.GetContent())]
       assertWithMatcher:grey_notNil()];
 }
 
 // Tests going back via back button then forward via history.forward().
 - (void)testHistoryForwardNavigation {
-// TODO(crbug.com/677129): Reenable this test.
-#if TARGET_OS_IPHONE
-  EARL_GREY_TEST_SKIPPED(@"flaky on devices");
-#endif  // TARGET_OS_IPHONE
-
   SetupBackAndForwardResponseProvider();
 
   // Navigate to an HTML page with a forward button.
   const GURL firstURL = web::test::HttpServer::MakeUrl(kForwardURL);
   [ChromeEarlGrey loadURL:firstURL];
 
   // Navigate to some other page.
   const GURL secondURL = web::test::HttpServer::MakeUrl(kTestURL);
   [ChromeEarlGrey loadURL:secondURL];
 
   // Tap the back button in the toolbar and verify the page with forward button
   // is loaded.
   [[EarlGrey selectElementWithMatcher:backButton()] performAction:grey_tap()];
+  [[EarlGrey
+      selectElementWithMatcher:webViewContainingText(kForwardHTMLSentinel)]
+      assertWithMatcher:grey_notNil()];
   [[EarlGrey selectElementWithMatcher:chrome_test_util::omniboxText(
                                           firstURL.GetContent())]
       assertWithMatcher:grey_notNil()];
-  [[EarlGrey
-      selectElementWithMatcher:webViewContainingText(kForwardHTMLSentinel)]
-      assertWithMatcher:grey_notNil()];
 
   // Tap the forward button in the HTML and verify the second URL is loaded.
   TapWebViewElementWithId(kForwardHTMLButtonLabel);
+  [[EarlGrey selectElementWithMatcher:webViewContainingText(kTestPageSentinel)]
+      assertWithMatcher:grey_notNil()];
   [[EarlGrey selectElementWithMatcher:chrome_test_util::omniboxText(
                                           secondURL.GetContent())]
       assertWithMatcher:grey_notNil()];
 
   // Verify that the forward button is not enabled.
   // TODO(crbug.com/638674): Evaluate if size class determination can move to
   // shared code.
   if (UIApplication.sharedApplication.keyWindow.traitCollection
           .horizontalSizeClass == UIUserInterfaceSizeClassCompact) {
     // In horizontally compact environments, the forward button is not visible.
@@ skipping 270 matching lines @@
   // Navigate forward and assert the the resulting page is the proper
   // destination.
   [[EarlGrey selectElementWithMatcher:forwardButton()]
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:chrome_test_util::omniboxText(
                                           destinationURL.GetContent())]
       assertWithMatcher:grey_notNil()];
 }
 
 @end