[ios] Fixes Toolbar egtests when the UIRefresh flag is enabled.

BUG=825431

Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: I6752cbf38aa826c9197c524e16b5adaa04f0af57
Reviewed-on: https://chromium-review.googlesource.com/990535Reviewed-by: Gauthier Ambard <gambard@chromium.org>
Commit-Queue: Rohit Rao <rohitrao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#547705}

ios/chrome/browser/ui/toolbar/toolbar_egtest.mm

@@ -169,7 +169,12 @@ using chrome_test_util::OmniboxText;
 }
 
 // Verifies the existence and state of toolbar UI elements.
-- (void)testToolbarUI {
+- (void)testPreRefreshToolbarUI {
+  if (IsUIRefreshPhase1Enabled()) {
+    EARL_GREY_TEST_SKIPPED(
+        @"This test is specific to the pre-refresh toolbar layout");
+  }
+
   id<GREYMatcher> reloadButton =
       chrome_test_util::ButtonWithAccessibilityLabelId(IDS_IOS_ACCNAME_RELOAD);
   id<GREYMatcher> bookmarkButton =
@@ -221,7 +226,12 @@ using chrome_test_util::OmniboxText;
     EARL_GREY_TEST_SKIPPED(@"Test not supported on iPhone");
   }
 
-  // Load some page so that the "Back" button is tappable.
+  // Load a webpage so that the "Back" button is tappable. Then load a second
+  // page so that the test can go back once without ending up on the NTP.
+  // (Subsequent steps in this test require the omnibox to be tappable, but in
+  // some configurations the NTP only has a fakebox and does not display the
+  // omnibox.)
+  [ChromeEarlGrey loadURL:GURL("about:blank")];
   [ChromeEarlGrey loadURL:GURL("chrome://version")];
 
   // First test: check that the keyboard is opened when tapping the omnibox,