[iOS] Disable Flaky OmniboxPopupTestCase Tests on iPhone Sim

TBR=stkhapugin@chromium.org

Bug: 1128463
Change-Id: I939bbb3883f1ece20bc357d53e5c603e2589f0f3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2521702Reviewed-by: Sebastien Lalancette <seblalancette@chromium.org>
Commit-Queue: Sebastien Lalancette <seblalancette@chromium.org>
Cr-Commit-Position: refs/heads/master@{#824879}

ios/chrome/browser/ui/omnibox/popup/omnibox_popup_egtest.mm

@@ -146,14 +146,14 @@ std::unique_ptr<net::test_server::HttpResponse> StandardResponse(
 }
 
 // Tests that the switch to open tab button isn't displayed for the current tab.
-- (void)testNotSwitchButtonOnCurrentTab {
-// TODO(crbug.com/1128463): Test is flaky on iPad simulator.
+// TODO(crbug.com/1128463): Test is flaky on simulators.
 #if TARGET_IPHONE_SIMULATOR
-  if ([ChromeEarlGrey isIPadIdiom]) {
-    EARL_GREY_TEST_SKIPPED(@"This test is flaky on iPad simulators.");
-  }
+#define MAYBE_testNotSwitchButtonOnCurrentTab \
+  DISABLED_testNotSwitchButtonOnCurrentTab
+#else
+#define MAYBE_testNotSwitchButtonOnCurrentTab testNotSwitchButtonOnCurrentTab
 #endif
-
+- (void)MAYBE_testNotSwitchButtonOnCurrentTab {
 // TODO(crbug.com/1067817): Test won't pass on iPad devices.
 #if !TARGET_IPHONE_SIMULATOR
   if ([ChromeEarlGrey isIPadIdiom]) {
@@ -276,14 +276,15 @@ std::unique_ptr<net::test_server::HttpResponse> StandardResponse(
   [ChromeEarlGrey waitForMainTabCount:1];
 }
 
-- (void)testDontCloseNTPWhenSwitchingWithForwardHistory {
-// TODO(crbug.com/1128463): Test is flaky on iPad simulator.
+// TODO(crbug.com/1128463): Test is flaky on simulators.
 #if TARGET_IPHONE_SIMULATOR
-  if ([ChromeEarlGrey isIPadIdiom]) {
-    EARL_GREY_TEST_SKIPPED(@"This test is flaky on iPad simulators.");
-  }
+#define MAYBE_testDontCloseNTPWhenSwitchingWithForwardHistory \
+  DISABLED_testDontCloseNTPWhenSwitchingWithForwardHistory
+#else
+#define MAYBE_testDontCloseNTPWhenSwitchingWithForwardHistory \
+  testDontCloseNTPWhenSwitchingWithForwardHistory
 #endif
-
+- (void)MAYBE_testDontCloseNTPWhenSwitchingWithForwardHistory {
 // TODO(crbug.com/1067817): Test won't pass on iPad devices.
 #if !TARGET_IPHONE_SIMULATOR
   if ([ChromeEarlGrey isIPadIdiom]) {