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

components/sync/engine/engine_components_factory.h

Index: components/sync/engine/engine_components_factory.h
diff --git a/components/sync/engine/engine_components_factory.h b/components/sync/engine/engine_components_factory.h
index fb80d0317af0b7521ebd708535dda8ecc6f4e2e7..175af5cf37af4426b50ed405153a02befd3cf576 100644
--- a/components/sync/engine/engine_components_factory.h
+++ b/components/sync/engine/engine_components_factory.h
@@ -56,11 +56,6 @@
     FORCE_ENABLE_PRE_COMMIT_UPDATE_AVOIDANCE,
   };
 
-  enum class NudgeDelay {
-    DEFAULT_NUDGE_DELAY,
-    SHORT_NUDGE_DELAY,
-  };
-
   // Configuration options for internal components. This struct is expected
   // to grow and shrink over time with transient features / experiments,
   // roughly following command line flags in chrome. Implementations of
@@ -69,7 +64,6 @@
   struct Switches {
     EncryptionMethod encryption_method;
     BackoffOverride backoff_override;
-    NudgeDelay nudge_delay;
     PreCommitUpdatesPolicy pre_commit_updates_policy;
   };