Re-disable SyncFakeServer tests on simulators and change bug number.

These tests were disabled for simulators for being flaky under multiple
simulators mode. Now the mode is turned off for these tests, they should
be re-enabled again,  but still failing due to issue 821490.

Bug: 814990
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: Ie75bfa9ed9ba14552123199ff2d202477ae12457
Reviewed-on: https://chromium-review.googlesource.com/961595
Commit-Queue: Menglu Huang <huangml@chromium.org>
Reviewed-by: edchin <edchin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543543}

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

@@ -131,9 +131,8 @@ 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 simulator test.
-// TODO(crbug.com/821490): Reenable the device test.
-- (void)FLAKY_testSyncUploadBookmarkOnFirstSync {
+// TODO(crbug.com/821490): Reenable the test.
+- (void)DISABLED_testSyncUploadBookmarkOnFirstSync {
   [self addBookmark:GURL("https://www.foo.com") withTitle:@"foo"];
 
   // Sign in to sync, after a bookmark has been added.
@@ -148,9 +147,8 @@ 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 simulator test.
-// TODO(crbug.com/821490): Reenable the device test.
-- (void)FLAKY_testSyncUploadBookmark {
+// TODO(crbug.com/821490): Reenable the test.
+- (void)DISABLED_testSyncUploadBookmark {
   ChromeIdentity* identity = [SigninEarlGreyUtils fakeIdentity1];
   ios::FakeChromeIdentityService::GetInstanceFromChromeProvider()->AddIdentity(
       identity);
@@ -164,9 +162,8 @@ 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 simulator test.
-// TODO(crbug.com/821490): Reenable the device test.
-- (void)FLAKY_testSyncDownloadBookmark {
+// TODO(crbug.com/821490): Reenable the test.
+- (void)DISABLED_testSyncDownloadBookmark {
   [[self class] assertBookmarksWithTitle:@"hoo" expectedCount:0];
   chrome_test_util::InjectBookmarkOnFakeSyncServer("http://www.hoo.com", "hoo");
 
@@ -268,14 +265,8 @@ void AssertNumberOfEntitiesWithName(int entity_count,
 }
 
 // Tests that autofill profile injected in FakeServer gets synced to client.
-// TODO(crbug.com/821490): Reenable the device test.
-#if TARGET_IPHONE_SIMULATOR
-#define MAYBE_testSyncDownloadAutofillProfile testSyncDownloadAutofillProfile
-#else
-#define MAYBE_testSyncDownloadAutofillProfile \
-  FLAKY_testSyncDownloadAutofillProfile
-#endif
-- (void)MAYBE_testSyncDownloadAutofillProfile {
+// TODO(crbug.com/821490): Reenable the test.
+- (void)DISABLED_testSyncDownloadAutofillProfile {
   const std::string kGuid = "2340E83B-5BEE-4560-8F95-5914EF7F539E";
   const std::string kFullName = "Peter Pan";
   GREYAssertFalse(chrome_test_util::IsAutofillProfilePresent(kGuid, kFullName),
@@ -300,9 +291,8 @@ void AssertNumberOfEntitiesWithName(int entity_count,
 
 // Test that update to autofill profile injected in FakeServer gets synced to
 // client.
-// TODO(crbug.com/814990): Reenable the simulator test.
-// TODO(crbug.com/821490): Reenable the device test.
-- (void)FLAKY_testSyncUpdateAutofillProfile {
+// TODO(crbug.com/821490): Reenable the test.
+- (void)DISABLED_testSyncUpdateAutofillProfile {
   const std::string kGuid = "2340E83B-5BEE-4560-8F95-5914EF7F539E";
   const std::string kFullName = "Peter Pan";
   const std::string kUpdatedFullName = "Roger Rabbit";
@@ -346,9 +336,8 @@ void AssertNumberOfEntitiesWithName(int entity_count,
 
 // Test that autofill profile deleted from FakeServer gets deleted from client
 // as well.
-// TODO(crbug.com/814990): Reenable the simulator test.
-// TODO(crbug.com/821490): Reenable the device test.
-- (void)FLAKY_testSyncDeleteAutofillProfile {
+// TODO(crbug.com/821490): Reenable the test.
+- (void)DISABLED_testSyncDeleteAutofillProfile {
   const std::string kGuid = "2340E83B-5BEE-4560-8F95-5914EF7F539E";
   const std::string kFullName = "Peter Pan";
   GREYAssertFalse(chrome_test_util::IsAutofillProfilePresent(kGuid, kFullName),
@@ -382,9 +371,8 @@ 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 simulator test.
-// TODO(crbug.com/821490): Reenable the device test.
-- (void)FLAKY_testSyncUploadOpenTabs {
+// TODO(crbug.com/821490): Reenable the test.
+- (void)DISABLED_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");
@@ -418,9 +406,8 @@ 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 simulator test.
-// TODO(crbug.com/821490): Reenable the device test.
-- (void)FLAKY_testSyncTypedURLUpload {
+// TODO(crbug.com/821490): Reenable the test.
+- (void)DISABLED_testSyncTypedURLUpload {
   const GURL mockURL("http://not-a-real-site/");
 
   GREYAssertTrue(chrome_test_util::ClearBrowsingHistory(),
@@ -459,9 +446,8 @@ void AssertNumberOfEntitiesWithName(int entity_count,
 }
 
 // Tests that typed url is downloaded from sync server.
-// TODO(crbug.com/814990): Reenable the simulator test.
-// TODO(crbug.com/821490): Reenable the device test.
-- (void)FLAKY_testSyncTypedUrlDownload {
+// TODO(crbug.com/821490): Reenable the test.
+- (void)DISABLED_testSyncTypedUrlDownload {
   const GURL mockURL("http://not-a-real-site/");
 
   GREYAssertTrue(chrome_test_util::ClearBrowsingHistory(),
@@ -498,9 +484,8 @@ 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 simulator test.
-// TODO(crbug.com/821490): Reenable the device test.
-- (void)FLAKY_testSyncTypedURLDeleteFromClient {
+// TODO(crbug.com/821490): Reenable the test.
+- (void)DISABLED_testSyncTypedURLDeleteFromClient {
   const GURL mockURL("http://not-a-real-site/");
 
   GREYAssertTrue(chrome_test_util::ClearBrowsingHistory(),
@@ -548,9 +533,8 @@ 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 simulator test.
-// TODO(crbug.com/821490): Reenable the device test.
-- (void)FLAKY_testSyncTypedURLDeleteFromServer {
+// TODO(crbug.com/821490): Reenable the test.
+- (void)DISABLED_testSyncTypedURLDeleteFromServer {
   const GURL mockURL("http://not-a-real-site/");
 
   GREYAssertTrue(chrome_test_util::ClearBrowsingHistory(),