| Index: chrome/browser/sync/sessions/sync_session_unittest.cc
|
| diff --git a/chrome/browser/sync/sessions/sync_session_unittest.cc b/chrome/browser/sync/sessions/sync_session_unittest.cc
|
| index 9bb1e3be80ef7427afdd08245b671210f00444a8..7362b39a5b9815f185113b3999c73b289980e346 100644
|
| --- a/chrome/browser/sync/sessions/sync_session_unittest.cc
|
| +++ b/chrome/browser/sync/sessions/sync_session_unittest.cc
|
| @@ -108,7 +108,7 @@ TEST_F(SyncSessionTest, ScopedContextHelpers) {
|
| TEST_F(SyncSessionTest, SetWriteTransaction) {
|
| TestDirectorySetterUpper db;
|
| db.SetUp();
|
| - session_.reset(NULL);
|
| + session_.reset();
|
| context_.reset(new SyncSessionContext(NULL, db.manager(), this,
|
| std::vector<SyncEngineEventListener*>()));
|
| session_.reset(MakeSession());
|
| @@ -250,6 +250,20 @@ TEST_F(SyncSessionTest, MoreToSyncIfConflictsResolved) {
|
| EXPECT_TRUE(session_->HasMoreToSync());
|
| }
|
|
|
| +TEST_F(SyncSessionTest, ResetTransientState) {
|
| + status()->update_conflicts_resolved(true);
|
| + status()->increment_num_successful_commits();
|
| + EXPECT_TRUE(session_->HasMoreToSync());
|
| + session_->ResetTransientState();
|
| + EXPECT_FALSE(status()->conflicts_resolved());
|
| + EXPECT_FALSE(session_->HasMoreToSync());
|
| + EXPECT_FALSE(status()->TestAndClearIsDirty());
|
| +}
|
| +
|
| +TEST_F(SyncSessionTest, Coalesce) {
|
| +
|
| +}
|
| +
|
| } // namespace
|
| } // namespace sessions
|
| } // namespace browser_sync
|
|
|