Revert of [sync] "TwoClientBookmarksSyncTest.Sanity" is flaky

components/sync/driver/sync_driver_switches.cc

Index: components/sync/driver/sync_driver_switches.cc
diff --git a/components/sync/driver/sync_driver_switches.cc b/components/sync/driver/sync_driver_switches.cc
index 6f446ecbd7c16c750166a1d485b591fb5e7d5468..77c95d7253f1a310fda28adc6e9e15f2962e40db 100644
--- a/components/sync/driver/sync_driver_switches.cc
+++ b/components/sync/driver/sync_driver_switches.cc
@@ -25,19 +25,12 @@
 const char kSyncShortInitialRetryOverride[] =
     "sync-short-initial-retry-override";
 
-// This flag significantly shortens the delay between nudge cycles. Its primary
-// purpose is to speed up integration tests. The normal delay allows coalescing
-// and prevention of server overload, so don't use this unless you're really
-// sure
-// that it's what you want.
-const char kSyncShortNudgeDelayForTest[] = "sync-short-nudge-delay-for-test";
-
 // Enables clearing of sync data when a user enables passphrase encryption.
 const base::Feature kSyncClearDataOnPassphraseEncryption{
     "ClearSyncDataOnPassphraseEncryption", base::FEATURE_DISABLED_BY_DEFAULT};
 
 // Enables USS implementation of DeviceInfo datatype. This flag controls whether
-// SyncableService based or ModelTypeService based implementation is used for
+// SyncableService based or ModelTypeSyncBridge based implementation is used for
 // DeviceInfo type.
 const base::Feature kSyncUSSDeviceInfo{"EnableSyncUSSDeviceInfo",
                                        base::FEATURE_DISABLED_BY_DEFAULT};