Revert of [Sync] Refactoring polling to be reliable.

sync/internal_api/sync_rollback_manager_unittest.cc

 // Copyright 2014 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.
 
 #include "sync/internal_api/sync_rollback_manager.h"
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/run_loop.h"
 #include "sync/internal_api/public/read_node.h"
 #include "sync/internal_api/public/read_transaction.h"
@@ skipping 184 matching lines @@
 
   delegate.add_expected_delete(new_pref_id);
   EXPECT_CALL(delegate, OnChangesApplied(_, _, _, _))
       .Times(1)
       .WillOnce(DoDefault());
   EXPECT_CALL(delegate, OnChangesComplete(_)).Times(1);
   EXPECT_CALL(*this, OnActionableError(Truly(IsRollbackDoneAction))).Times(1);
 
   ModelSafeRoutingInfo routing_info;
   routing_info[PREFERENCES] = GROUP_UI;
-  rollback_manager.StartSyncingNormally(routing_info, base::Time());
+  rollback_manager.StartSyncingNormally(routing_info);
 }
 
 TEST_F(SyncRollbackManagerTest, NoRollbackOfTypesNotBackedUp) {
   PrepopulateDb(PREFERENCES, "pref1");
 
   TestChangeDelegate delegate;
   SyncRollbackManager rollback_manager;
   InitManager(&rollback_manager, ModelTypeSet(PREFERENCES, APPS), &delegate,
               InternalComponentsFactory::STORAGE_ON_DISK);
 
   // Simulate new entry added during type initialization.
   int64 new_pref_id =
       CreateEntry(rollback_manager.GetUserShare(), PREFERENCES, "pref2");
   CreateEntry(rollback_manager.GetUserShare(), APPS, "app1");
 
   delegate.add_expected_delete(new_pref_id);
   EXPECT_CALL(delegate, OnChangesApplied(_, _, _, _))
       .Times(1)
       .WillOnce(DoDefault());
   EXPECT_CALL(delegate, OnChangesComplete(_)).Times(1);
 
   ModelSafeRoutingInfo routing_info;
   routing_info[PREFERENCES] = GROUP_UI;
-  rollback_manager.StartSyncingNormally(routing_info, base::Time());
+  rollback_manager.StartSyncingNormally(routing_info);
 
   // APP entry is still valid.
   EXPECT_TRUE(VerifyEntry(rollback_manager.GetUserShare(), APPS, "app1"));
 }
 
 TEST_F(SyncRollbackManagerTest, BackupDbNotChangedOnAbort) {
   PrepopulateDb(PREFERENCES, "pref1");
 
   TestChangeDelegate delegate;
   scoped_ptr<SyncRollbackManager> rollback_manager(
@@ skipping 19 matching lines @@
   // Test graceful shutdown on initialization failure.
   scoped_ptr<SyncRollbackManager> rollback_manager(
       new SyncRollbackManager);
   InitManager(rollback_manager.get(), ModelTypeSet(PREFERENCES), NULL,
               InternalComponentsFactory::STORAGE_ON_DISK);
 }
 
 }  // anonymous namespace
 
 }  // namespace syncer