From 42fff674909f23a7ad89318444884c64b1b67182 Mon Sep 17 00:00:00 2001 From: "rlarocque@chromium.org" Date: Fri, 8 Jun 2012 23:25:22 +0000 Subject: Refactor following sync commit loop change This change includes some cleanups of the code introduced in r139519. They have been kept separate from that CL in the hopes of making both CLs easiser to read. This commit moves some error-detection functionality from ProcessCommitResponse's ModelNeutralExecuteImpl() into BuildAndPostCommits(). This simplifies some of the error handling and allows us to remove ModelChangingSyncerCommand's ModelNeutralExecuteImpl(). This CL also combines both commit error indicators into a single variable. BUG=91696,36594 TEST= Review URL: https://chromiumcodereview.appspot.com/10523003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141321 0039d316-1c4b-4281-b951-d872f2087c98 --- sync/sessions/status_controller_unittest.cc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'sync/sessions/status_controller_unittest.cc') diff --git a/sync/sessions/status_controller_unittest.cc b/sync/sessions/status_controller_unittest.cc index 9f38e80..2e0f44d 100644 --- a/sync/sessions/status_controller_unittest.cc +++ b/sync/sessions/status_controller_unittest.cc @@ -66,12 +66,8 @@ TEST_F(StatusControllerTest, ReadYourWrites) { status.set_last_download_updates_result(SYNCER_OK); EXPECT_EQ(SYNCER_OK, status.error().last_download_updates_result); - status.set_last_post_commit_result(SYNC_AUTH_ERROR); - EXPECT_EQ(SYNC_AUTH_ERROR, status.error().last_post_commit_result); - - status.set_last_process_commit_response_result(SYNC_SERVER_ERROR); - EXPECT_EQ(SYNC_SERVER_ERROR, - status.error().last_process_commit_response_result); + status.set_commit_result(SYNC_AUTH_ERROR); + EXPECT_EQ(SYNC_AUTH_ERROR, status.error().commit_result); for (int i = 0; i < 14; i++) status.increment_num_successful_commits(); -- cgit v1.1