[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 77c95d7253f1a310fda28adc6e9e15f2962e40db..075291b1c9b49b6bdefddec395d20af64a0f4b1d 100644
--- a/components/sync/driver/sync_driver_switches.cc
+++ b/components/sync/driver/sync_driver_switches.cc
@@ -25,12 +25,18 @@ const char kSyncServiceURL[] = "sync-url";
 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

[Nicolas Zea, 2016/11/09 00:35:13]

nit: "test.The" -> "test. The"

[Patrick Noland, 2016/11/10 22:13:00]

Done.

+// and prevention of server load, so don't use this unless you're really sure

[Nicolas Zea, 2016/11/09 00:35:13]

nit: "server load" -> "server overload"

[Patrick Noland, 2016/11/10 22:13:00]

Done.

+// that it's what you want.
+const char kSyncShortNudgeDelay[] = "sync-short-nudge-delay";

[Nicolas Zea, 2016/11/09 00:35:13]

I think it might be good to call this short-nudge-delay-for-test, or something
like that to make it clear it's for tests only.

[Patrick Noland, 2016/11/10 22:13:00]

Done.

+
 // 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 ModelTypeSyncBridge based implementation is used for
+// SyncableService based or ModelTypeService based implementation is used for
 // DeviceInfo type.
 const base::Feature kSyncUSSDeviceInfo{"EnableSyncUSSDeviceInfo",
                                        base::FEATURE_DISABLED_BY_DEFAULT};