Disable failing SyncFakeServer egtests

These tests have been failing on these device bots:
(iPad Air iOS 10.3.3) on iOS-10.3.3
(iPhone 6s iOS 10.3.3) on iOS-10.3.3

Since March 7, revision:
1cbfed836fceb54df561b43e7cd8e5d65ea41137

TBR=huangml

Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: I69616206990b473a3ea828136e87166a11308950
Reviewed-on: https://chromium-review.googlesource.com/960842
Commit-Queue: edchin <edchin@chromium.org>
Reviewed-by: edchin <edchin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#542826}

ios/chrome/browser/ui/settings/sync_utils/sync_fake_server_egtest.mm

@@ -132,14 +132,7 @@ void AssertNumberOfEntitiesWithName(int entity_count,
 // Tests that a bookmark added on the client (before Sync is enabled) is
 // uploaded to the Sync server once Sync is turned on.
 // TODO(crbug.com/814990): Reenable the test.
-#if TARGET_IPHONE_SIMULATOR
-#define MAYBE_testSyncUploadBookmarkOnFirstSync \
-  FLAKY_testSyncUploadBookmarkOnFirstSync
-#else
-#define MAYBE_testSyncUploadBookmarkOnFirstSync \
-  testSyncUploadBookmarkOnFirstSync
-#endif
-- (void)MAYBE_testSyncUploadBookmarkOnFirstSync {
+- (void)FLAKY_testSyncUploadBookmarkOnFirstSync {
   [self addBookmark:GURL("https://www.foo.com") withTitle:@"foo"];
 
   // Sign in to sync, after a bookmark has been added.
@@ -155,12 +148,7 @@ void AssertNumberOfEntitiesWithName(int entity_count,
 
 // Tests that a bookmark added on the client is uploaded to the Sync server.
 // TODO(crbug.com/814990): Reenable the test.
-#if TARGET_IPHONE_SIMULATOR
-#define MAYBE_testSyncUploadBookmark FLAKY_testSyncUploadBookmark
-#else
-#define MAYBE_testSyncUploadBookmark testSyncUploadBookmark
-#endif
-- (void)MAYBE_testSyncUploadBookmark {
+- (void)FLAKY_testSyncUploadBookmark {
   ChromeIdentity* identity = [SigninEarlGreyUtils fakeIdentity1];
   ios::FakeChromeIdentityService::GetInstanceFromChromeProvider()->AddIdentity(
       identity);
@@ -175,12 +163,7 @@ void AssertNumberOfEntitiesWithName(int entity_count,
 // Tests that a bookmark injected in the FakeServer is synced down to the
 // client.
 // TODO(crbug.com/814990): Reenable the test.
-#if TARGET_IPHONE_SIMULATOR
-#define MAYBE_testSyncDownloadBookmark FLAKY_testSyncDownloadBookmark
-#else
-#define MAYBE_testSyncDownloadBookmark testSyncDownloadBookmark
-#endif
-- (void)MAYBE_testSyncDownloadBookmark {
+- (void)FLAKY_testSyncDownloadBookmark {
   [[self class] assertBookmarksWithTitle:@"hoo" expectedCount:0];
   chrome_test_util::InjectBookmarkOnFakeSyncServer("http://www.hoo.com", "hoo");
 
@@ -282,7 +265,14 @@ void AssertNumberOfEntitiesWithName(int entity_count,
 }
 
 // Tests that autofill profile injected in FakeServer gets synced to client.
-- (void)testSyncDownloadAutofillProfile {
+// TODO(crbug.com/814990): Reenable the test.
+#if TARGET_IPHONE_SIMULATOR
+#define MAYBE_testSyncDownloadAutofillProfile testSyncDownloadAutofillProfile
+#else
+#define MAYBE_testSyncDownloadAutofillProfile \
+  FLAKY_testSyncDownloadAutofillProfile
+#endif
+- (void)MAYBE_testSyncDownloadAutofillProfile {
   const std::string kGuid = "2340E83B-5BEE-4560-8F95-5914EF7F539E";
   const std::string kFullName = "Peter Pan";
   GREYAssertFalse(chrome_test_util::IsAutofillProfilePresent(kGuid, kFullName),
@@ -308,12 +298,7 @@ void AssertNumberOfEntitiesWithName(int entity_count,
 // Test that update to autofill profile injected in FakeServer gets synced to
 // client.
 // TODO(crbug.com/814990): Reenable the test.
-#if TARGET_IPHONE_SIMULATOR
-#define MAYBE_testSyncUpdateAutofillProfile FLAKY_testSyncUpdateAutofillProfile
-#else
-#define MAYBE_testSyncUpdateAutofillProfile testSyncUpdateAutofillProfile
-#endif
-- (void)MAYBE_testSyncUpdateAutofillProfile {
+- (void)FLAKY_testSyncUpdateAutofillProfile {
   const std::string kGuid = "2340E83B-5BEE-4560-8F95-5914EF7F539E";
   const std::string kFullName = "Peter Pan";
   const std::string kUpdatedFullName = "Roger Rabbit";
@@ -358,12 +343,7 @@ void AssertNumberOfEntitiesWithName(int entity_count,
 // Test that autofill profile deleted from FakeServer gets deleted from client
 // as well.
 // TODO(crbug.com/814990): Reenable the test.
-#if TARGET_IPHONE_SIMULATOR
-#define MAYBE_testSyncDeleteAutofillProfile FLAKY_testSyncDeleteAutofillProfile
-#else
-#define MAYBE_testSyncDeleteAutofillProfile testSyncDeleteAutofillProfile
-#endif
-- (void)MAYBE_testSyncDeleteAutofillProfile {
+- (void)FLAKY_testSyncDeleteAutofillProfile {
   const std::string kGuid = "2340E83B-5BEE-4560-8F95-5914EF7F539E";
   const std::string kFullName = "Peter Pan";
   GREYAssertFalse(chrome_test_util::IsAutofillProfilePresent(kGuid, kFullName),
@@ -398,12 +378,7 @@ void AssertNumberOfEntitiesWithName(int entity_count,
 // Tests that tabs opened on this client are committed to the Sync server and
 // that the created sessions entities are correct.
 // TODO(crbug.com/814990): Reenable the test.
-#if TARGET_IPHONE_SIMULATOR
-#define MAYBE_testSyncUploadOpenTabs FLAKY_testSyncUploadOpenTabs
-#else
-#define MAYBE_testSyncUploadOpenTabs testSyncUploadOpenTabs
-#endif
-- (void)MAYBE_testSyncUploadOpenTabs {
+- (void)FLAKY_testSyncUploadOpenTabs {
   // Create map of canned responses and set up the test HTML server.
   const GURL URL1 = web::test::HttpServer::MakeUrl("http://page1");
   const GURL URL2 = web::test::HttpServer::MakeUrl("http://page2");
@@ -438,12 +413,7 @@ void AssertNumberOfEntitiesWithName(int entity_count,
 // Tests that a typed URL (after Sync is enabled) is uploaded to the Sync
 // server.
 // TODO(crbug.com/814990): Reenable the test.
-#if TARGET_IPHONE_SIMULATOR
-#define MAYBE_testSyncTypedURLUpload FLAKY_testSyncTypedURLUpload
-#else
-#define MAYBE_testSyncTypedURLUpload testSyncTypedURLUpload
-#endif
-- (void)MAYBE_testSyncTypedURLUpload {
+- (void)FLAKY_testSyncTypedURLUpload {
   const GURL mockURL("http://not-a-real-site/");
 
   GREYAssertTrue(chrome_test_util::ClearBrowsingHistory(),
@@ -483,12 +453,7 @@ void AssertNumberOfEntitiesWithName(int entity_count,
 
 // Tests that typed url is downloaded from sync server.
 // TODO(crbug.com/814990): Reenable the test.
-#if TARGET_IPHONE_SIMULATOR
-#define MAYBE_testSyncTypedUrlDownload FLAKY_testSyncTypedUrlDownload
-#else
-#define MAYBE_testSyncTypedUrlDownload testSyncTypedUrlDownload
-#endif
-- (void)MAYBE_testSyncTypedUrlDownload {
+- (void)FLAKY_testSyncTypedUrlDownload {
   const GURL mockURL("http://not-a-real-site/");
 
   GREYAssertTrue(chrome_test_util::ClearBrowsingHistory(),
@@ -526,13 +491,7 @@ void AssertNumberOfEntitiesWithName(int entity_count,
 // Tests that when typed url is deleted on the client, sync the change gets
 // propagated to server.
 // TODO(crbug.com/814990): Reenable the test.
-#if TARGET_IPHONE_SIMULATOR
-#define MAYBE_testSyncTypedURLDeleteFromClient \
-  FLAKY_testSyncTypedURLDeleteFromClient
-#else
-#define MAYBE_testSyncTypedURLDeleteFromClient testSyncTypedURLDeleteFromClient
-#endif
-- (void)MAYBE_testSyncTypedURLDeleteFromClient {
+- (void)FLAKY_testSyncTypedURLDeleteFromClient {
   const GURL mockURL("http://not-a-real-site/");
 
   GREYAssertTrue(chrome_test_util::ClearBrowsingHistory(),
@@ -581,13 +540,7 @@ void AssertNumberOfEntitiesWithName(int entity_count,
 // Test that typed url is deleted from client after server sends tombstone for
 // that typed url.
 // TODO(crbug.com/814990): Reenable the test.
-#if TARGET_IPHONE_SIMULATOR
-#define MAYBE_testSyncTypedURLDeleteFromServer \
-  FLAKY_testSyncTypedURLDeleteFromServer
-#else
-#define MAYBE_testSyncTypedURLDeleteFromServer testSyncTypedURLDeleteFromServer
-#endif
-- (void)MAYBE_testSyncTypedURLDeleteFromServer {
+- (void)FLAKY_testSyncTypedURLDeleteFromServer {
   const GURL mockURL("http://not-a-real-site/");
 
   GREYAssertTrue(chrome_test_util::ClearBrowsingHistory(),