Index: sync/engine/syncer_unittest.cc |
diff --git a/sync/engine/syncer_unittest.cc b/sync/engine/syncer_unittest.cc |
index 28650a68219f2857aa7b890d81d710fb434f4b0b..31cd1e44dad3d4d1cf9a35c3e3c87557530dd626 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() { |
@@ -2529,7 +2527,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, |
@@ -2560,7 +2557,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()); |
} |