| Index: sync/engine/syncer_unittest.cc
|
| diff --git a/sync/engine/syncer_unittest.cc b/sync/engine/syncer_unittest.cc
|
| index 65742eb3e6dd82d250c3589b1fe4eb56de8c14ec..1cd97533a1a76e69c6d59ce66788bb2339526328 100644
|
| --- a/sync/engine/syncer_unittest.cc
|
| +++ b/sync/engine/syncer_unittest.cc
|
| @@ -792,7 +792,7 @@ TEST_F(SyncerTest, GetCommitIdsFiltersUnreadyEntries) {
|
| {
|
| const StatusController& status_controller = session_->status_controller();
|
| // Expect success.
|
| - EXPECT_EQ(status_controller.last_post_commit_result(), SYNCER_OK);
|
| + EXPECT_EQ(status_controller.error().commit_result, SYNCER_OK);
|
| // None should be unsynced anymore.
|
| ReadTransaction rtrans(FROM_HERE, directory());
|
| VERIFY_ENTRY(1, false, false, false, 0, 21, 21, ids_, &rtrans);
|
| @@ -953,7 +953,7 @@ TEST_F(SyncerTest, EncryptionAwareConflicts) {
|
| EXPECT_EQ(2, status().syncer_status().num_server_overwrites);
|
| EXPECT_EQ(1, status().syncer_status().num_local_overwrites);
|
| // We successfully commited item(s).
|
| - EXPECT_EQ(status().last_post_commit_result(), SYNCER_OK);
|
| + EXPECT_EQ(status().error().commit_result, SYNCER_OK);
|
| SyncShareNudge();
|
|
|
| // Everything should be resolved now. The local changes should have
|
| @@ -961,7 +961,7 @@ TEST_F(SyncerTest, EncryptionAwareConflicts) {
|
| // overwrote the local for entry 3.
|
| EXPECT_EQ(0, status().syncer_status().num_server_overwrites);
|
| EXPECT_EQ(0, status().syncer_status().num_local_overwrites);
|
| - EXPECT_EQ(status().last_post_commit_result(), SYNCER_OK);
|
| + EXPECT_EQ(status().error().commit_result, SYNCER_OK);
|
| ReadTransaction rtrans(FROM_HERE, directory());
|
| VERIFY_ENTRY(1, false, false, false, 0, 41, 41, ids_, &rtrans);
|
| VERIFY_ENTRY(2, false, false, false, 1, 31, 31, ids_, &rtrans);
|
| @@ -2728,7 +2728,7 @@ TEST_F(SyncerTest, CommitManyItemsInOneGo_PostBufferFail) {
|
| EXPECT_EQ(1U, mock_server_->commit_messages().size());
|
| EXPECT_FALSE(session_->Succeeded());
|
| EXPECT_EQ(SYNC_SERVER_ERROR,
|
| - session_->status_controller().error().last_post_commit_result);
|
| + session_->status_controller().error().commit_result);
|
| EXPECT_EQ(items_to_commit - kDefaultMaxCommitBatchSize,
|
| directory()->unsynced_entity_count());
|
| }
|
|
|