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

components/sync/engine_impl/sync_scheduler_impl.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_IMPL_SYNC_SCHEDULER_IMPL_H_
 #define COMPONENTS_SYNC_ENGINE_IMPL_SYNC_SCHEDULER_IMPL_H_
 
 #include <map>
 #include <memory>
 #include <string>
@@ skipping 68 matching lines @@
       const std::map<ModelType, base::TimeDelta>& nudge_delays) override;
   void OnReceivedClientInvalidationHintBufferSize(int size) override;
   void OnSyncProtocolError(
       const SyncProtocolError& sync_protocol_error) override;
   void OnReceivedGuRetryDelay(const base::TimeDelta& delay) override;
   void OnReceivedMigrationRequest(ModelTypeSet types) override;
 
   // Returns true if the client is currently in exponential backoff.
   bool IsBackingOff() const;
 
-  // Changes the default delay between nudge cycles. Model-type specific
-  // overrides will still apply. This is made public so that nudge cycles can be
-  // shortened in integration tests.
-  void SetDefaultNudgeDelay(base::TimeDelta delay_ms);
-
  private:
   enum JobPriority {
     // Non-canary jobs respect exponential backoff.
     NORMAL_PRIORITY,
     // Canary jobs bypass exponential backoff, so use with extreme caution.
     CANARY_PRIORITY
   };
 
   enum PollAdjustType {
     // Restart the poll interval.
@@ skipping 33 matching lines @@
     WaitInterval(Mode mode, base::TimeDelta length);
 
     static const char* GetModeString(Mode mode);
 
     Mode mode;
     base::TimeDelta length;
   };
 
   static const char* GetModeString(Mode mode);
 
+  void SetDefaultNudgeDelay(base::TimeDelta delay_ms);
+
   // Invoke the syncer to perform a nudge job.
   void DoNudgeSyncCycleJob(JobPriority priority);
 
   // Invoke the syncer to perform a configuration job.
   void DoConfigurationSyncCycleJob(JobPriority priority);
 
   void DoClearServerDataSyncCycleJob(JobPriority priority);
 
   // Helper function for Do{Nudge,Configuration,Poll}SyncCycleJob.
   void HandleSuccess();
@@ skipping 161 matching lines @@
   // A second factory specially for weak_handle_this_, to allow the handle
   // to be const and alleviate threading concerns.
   base::WeakPtrFactory<SyncSchedulerImpl> weak_ptr_factory_for_weak_handle_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncSchedulerImpl);
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_ENGINE_IMPL_SYNC_SCHEDULER_IMPL_H_