| Index: sync/engine/syncer_unittest.cc
|
| diff --git a/sync/engine/syncer_unittest.cc b/sync/engine/syncer_unittest.cc
|
| index c57def1cecf6c7b49b3645bb1515095aadecd577..3d8bf61cd98b0353673e8ffceaebf2adce0254c5 100644
|
| --- a/sync/engine/syncer_unittest.cc
|
| +++ b/sync/engine/syncer_unittest.cc
|
| @@ -185,26 +185,24 @@ class SyncerTest : public testing::Test,
|
| info, workers);
|
| }
|
|
|
| - bool SyncShareAsDelegate(
|
| - SyncSchedulerImpl::SyncSessionJob::SyncSessionJobPurpose purpose) {
|
| + bool SyncShareAsDelegate(SyncSessionJob::Purpose purpose) {
|
| SyncerStep start;
|
| SyncerStep end;
|
| - SyncSchedulerImpl::SetSyncerStepsForPurpose(purpose, &start, &end);
|
| + SyncSessionJob::GetSyncerStepsForPurpose(purpose, &start, &end);
|
|
|
| session_.reset(MakeSession());
|
| - syncer_->SyncShare(session_.get(), start, end);
|
| + EXPECT_TRUE(syncer_->SyncShare(session_.get(), start, end));
|
| return session_->HasMoreToSync();
|
| }
|
|
|
| bool SyncShareNudge() {
|
| session_.reset(MakeSession());
|
| - return SyncShareAsDelegate(SyncSchedulerImpl::SyncSessionJob::NUDGE);
|
| + return SyncShareAsDelegate(SyncSessionJob::NUDGE);
|
| }
|
|
|
| bool SyncShareConfigure() {
|
| session_.reset(MakeSession());
|
| - return SyncShareAsDelegate(
|
| - SyncSchedulerImpl::SyncSessionJob::CONFIGURATION);
|
| + return SyncShareAsDelegate(SyncSessionJob::CONFIGURATION);
|
| }
|
|
|
| void LoopSyncShare() {
|
| @@ -2514,7 +2512,6 @@ TEST_F(SyncerTest, CommitManyItemsInOneGo_PostBufferFail) {
|
| SyncShareNudge();
|
|
|
| EXPECT_EQ(1U, mock_server_->commit_messages().size());
|
| - EXPECT_FALSE(session_->Succeeded());
|
| EXPECT_EQ(SYNC_SERVER_ERROR,
|
| session_->status_controller().model_neutral_state().commit_result);
|
| EXPECT_EQ(items_to_commit - kDefaultMaxCommitBatchSize,
|
| @@ -2545,7 +2542,7 @@ TEST_F(SyncerTest, CommitManyItemsInOneGo_CommitConflict) {
|
|
|
| // We should stop looping at the first sign of trouble.
|
| EXPECT_EQ(1U, mock_server_->commit_messages().size());
|
| - EXPECT_FALSE(session_->Succeeded());
|
| + EXPECT_FALSE(session_->HasMoreToSync());
|
| EXPECT_EQ(items_to_commit - (kDefaultMaxCommitBatchSize - 1),
|
| directory()->unsynced_entity_count());
|
| }
|
|
|