| Index: chrome/browser/sync/sessions/status_controller_unittest.cc
|
| diff --git a/chrome/browser/sync/sessions/status_controller_unittest.cc b/chrome/browser/sync/sessions/status_controller_unittest.cc
|
| index 2c7b692600fcbc0fe3fe9461bb523cea4e83e16b..1b3c17f10eb25a8b4aace85f92ad2727c30b28ed 100644
|
| --- a/chrome/browser/sync/sessions/status_controller_unittest.cc
|
| +++ b/chrome/browser/sync/sessions/status_controller_unittest.cc
|
| @@ -78,8 +78,6 @@ TEST_F(StatusControllerTest, GetsDirty) {
|
|
|
| TEST_F(StatusControllerTest, StaysClean) {
|
| StatusController status(routes_);
|
| - status.update_conflict_sets_built(true);
|
| - EXPECT_FALSE(status.TestAndClearIsDirty());
|
| status.update_conflicts_resolved(true);
|
| EXPECT_FALSE(status.TestAndClearIsDirty());
|
|
|
| @@ -125,10 +123,6 @@ TEST_F(StatusControllerTest, ReadYourWrites) {
|
| status.update_conflicts_resolved(true);
|
| EXPECT_TRUE(status.conflicts_resolved());
|
|
|
| - EXPECT_FALSE(status.conflict_sets_built());
|
| - status.update_conflict_sets_built(true);
|
| - EXPECT_TRUE(status.conflict_sets_built());
|
| -
|
| status.set_last_download_updates_result(SYNCER_OK);
|
| EXPECT_EQ(SYNCER_OK, status.error().last_download_updates_result);
|
|
|
|
|