| Index: sync/sessions/status_controller_unittest.cc
|
| diff --git a/sync/sessions/status_controller_unittest.cc b/sync/sessions/status_controller_unittest.cc
|
| index 95362e5b0104009e49fa4857b9d36cd7dd77b987..d361a6e295bb09c3b2481e82a9339aa21dd8e0ad 100644
|
| --- a/sync/sessions/status_controller_unittest.cc
|
| +++ b/sync/sessions/status_controller_unittest.cc
|
| @@ -26,10 +26,6 @@ TEST_F(StatusControllerTest, ReadYourWrites) {
|
| status.set_num_server_changes_remaining(13);
|
| EXPECT_EQ(13, status.num_server_changes_remaining());
|
|
|
| - EXPECT_FALSE(status.conflicts_resolved());
|
| - status.update_conflicts_resolved(true);
|
| - EXPECT_TRUE(status.conflicts_resolved());
|
| -
|
| status.set_last_download_updates_result(SYNCER_OK);
|
| EXPECT_EQ(SYNCER_OK,
|
| status.model_neutral_state().last_download_updates_result);
|
|
|