sync: Follow-up to conflict resolution refactor

sync/sessions/sync_session_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/sessions/sync_session.h"
 
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
-#include "sync/engine/conflict_resolver.h"
 #include "sync/engine/syncer_types.h"
 #include "sync/engine/throttled_data_type_tracker.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/base/model_type_invalidation_map_test_util.h"
-#include "sync/sessions/session_state.h"
 #include "sync/sessions/status_controller.h"
 #include "sync/syncable/syncable_id.h"
 #include "sync/syncable/write_transaction.h"
 #include "sync/test/engine/fake_model_worker.h"
 #include "sync/test/engine/test_directory_setter_upper.h"
 #include "sync/test/fake_extensions_activity_monitor.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 
@@ skipping 128 matching lines @@
 
 TEST_F(SyncSessionTest, EnabledGroups) {
   scoped_ptr<SyncSession> session(MakeSession());
   std::set<ModelSafeGroup> expected_enabled_groups;
   expected_enabled_groups.insert(GROUP_PASSIVE);
   expected_enabled_groups.insert(GROUP_UI);
   expected_enabled_groups.insert(GROUP_DB);
   EXPECT_EQ(expected_enabled_groups, session->GetEnabledGroups());
 }
 
-TEST_F(SyncSessionTest, ScopedContextHelpers) {
-  ConflictResolver resolver;
-  EXPECT_FALSE(context_->resolver());
-  {
-    ScopedSessionContextConflictResolver s_resolver(context_.get(), &resolver);
-    EXPECT_EQ(&resolver, context_->resolver());
-  }
-  EXPECT_FALSE(context_->resolver());
-}
-
 TEST_F(SyncSessionTest, SetWriteTransaction) {
   TestDirectorySetterUpper dir_maker;
   dir_maker.SetUp();
   syncable::Directory* directory = dir_maker.directory();
 
   scoped_ptr<SyncSession> session(MakeSession());
   EXPECT_TRUE(NULL == session->write_transaction());
   {
     WriteTransaction trans(FROM_HERE, syncable::UNITTEST, directory);
     sessions::ScopedSetSessionWriteTransaction set_trans(session.get(), &trans);
     EXPECT_TRUE(&trans == session->write_transaction());
   }
 }
 
 TEST_F(SyncSessionTest, MoreToDownloadIfDownloadFailed) {
   status()->set_updates_request_types(ParamsMeaningAllEnabledTypes());
 
   status()->set_last_download_updates_result(NETWORK_IO_ERROR);
 
   // When DownloadUpdatesCommand fails, these should be false.
   EXPECT_FALSE(status()->ServerSaysNothingMoreToDownload());
   EXPECT_FALSE(status()->download_updates_succeeded());
-
-  // Download updates has its own loop in the syncer; it shouldn't factor
-  // into HasMoreToSync.
-  EXPECT_FALSE(session_->HasMoreToSync());
 }
 
 TEST_F(SyncSessionTest, MoreToDownloadIfGotChangesRemaining) {
   status()->set_updates_request_types(ParamsMeaningAllEnabledTypes());
 
   // When the server returns changes_remaining, that means there's
   // more to download.
   status()->set_last_download_updates_result(SYNCER_OK);
   status()->mutable_updates_response()->mutable_get_updates()
      ->set_changes_remaining(1000L);
   EXPECT_FALSE(status()->ServerSaysNothingMoreToDownload());
   EXPECT_TRUE(status()->download_updates_succeeded());
-
-  // Download updates has its own loop in the syncer; it shouldn't factor
-  // into HasMoreToSync.
-  EXPECT_FALSE(session_->HasMoreToSync());
 }
 
 TEST_F(SyncSessionTest, MoreToDownloadIfGotNoChangesRemaining) {
   status()->set_updates_request_types(ParamsMeaningAllEnabledTypes());
 
   status()->set_last_download_updates_result(SYNCER_OK);
   status()->mutable_updates_response()->mutable_get_updates()
       ->set_changes_remaining(0);
   EXPECT_TRUE(status()->ServerSaysNothingMoreToDownload());
   EXPECT_TRUE(status()->download_updates_succeeded());
-
-  // Download updates has its own loop in the syncer; it shouldn't factor
-  // into HasMoreToSync.
-  EXPECT_FALSE(session_->HasMoreToSync());
-}
-
-TEST_F(SyncSessionTest, MoreToSyncIfConflictsResolved) {
-  // Conflict resolution happens after get updates and commit,
-  // so we need to loop back and get updates / commit again now
-  // that we have made forward progress.
-  status()->update_conflicts_resolved(true);
-  EXPECT_TRUE(session_->HasMoreToSync());
-}
-
-TEST_F(SyncSessionTest, ResetTransientState) {
-  status()->update_conflicts_resolved(true);
-  status()->increment_num_successful_commits();
-  EXPECT_TRUE(session_->HasMoreToSync());
-  session_->PrepareForAnotherSyncCycle();
-  EXPECT_EQ(sync_pb::GetUpdatesCallerInfo::SYNC_CYCLE_CONTINUATION,
-            session_->source().updates_source);
-  EXPECT_FALSE(status()->conflicts_resolved());
-  EXPECT_FALSE(session_->HasMoreToSync());
 }
 
 TEST_F(SyncSessionTest, Coalesce) {
   std::vector<ModelSafeWorker*> workers_one, workers_two;
   ModelSafeRoutingInfo routes_one, routes_two;
   ModelTypeInvalidationMap one_type =
       ModelTypeSetToInvalidationMap(
           ParamsMeaningJustOneEnabledType(),
           std::string());
   ModelTypeInvalidationMap all_types =
@@ skipping 216 matching lines @@
 
   ASSERT_EQ(3U, invalidation_map.size());
   EXPECT_EQ(invalidation_map[BOOKMARKS].payload, payload);
   EXPECT_EQ(invalidation_map[PASSWORDS].payload, payload);
   EXPECT_EQ(invalidation_map[AUTOFILL].payload, payload);
 }
 
 }  // namespace
 }  // namespace sessions
 }  // namespace syncer