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

components/sync/engine/engine_components_factory.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_SYNC_ENGINE_ENGINE_COMPONENTS_FACTORY_H_
 #define COMPONENTS_SYNC_ENGINE_ENGINE_COMPONENTS_FACTORY_H_
 
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 38 matching lines @@
   enum PreCommitUpdatesPolicy {
     // By default, the server will enable or disable this experiment through the
     // sync protocol's experiments data type.
     SERVER_CONTROLLED_PRE_COMMIT_UPDATE_AVOIANCE,
 
     // This flag overrides the server's decision and enables the pre-commit
     // update avoidance experiment.
     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
   // EngineComponentsFactory can use this information to build components
   // with appropriate bells and whistles.
   struct Switches {
     EncryptionMethod encryption_method;
     BackoffOverride backoff_override;
-    NudgeDelay nudge_delay;
     PreCommitUpdatesPolicy pre_commit_updates_policy;
   };
 
   // For selecting the types of storage to use to persist sync data when
   // BuildDirectoryBackingStore() is called.
   enum StorageOption {
     // BuildDirectoryBackingStore should not use persistent on-disk storage.
     STORAGE_IN_MEMORY,
     // Use this if you want BuildDirectoryBackingStore to create/use a real
     // on disk store.
@@ skipping 24 matching lines @@
                              const base::FilePath& backing_filepath) = 0;
 
   // Returns the Switches struct that this object is using as configuration, if
   // the implementation is making use of one.
   virtual Switches GetSwitches() const = 0;
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_ENGINE_ENGINE_COMPONENTS_FACTORY_H_