sync: Merge apply updates and resolve conflicts

sync/sessions/status_controller_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 "sync/test/engine/test_id_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 namespace sessions {
@@ skipping 24 matching lines @@
             status.model_neutral_state().last_download_updates_result);
 
   status.set_commit_result(SYNC_AUTH_ERROR);
   EXPECT_EQ(SYNC_AUTH_ERROR, status.model_neutral_state().commit_result);
 
   for (int i = 0; i < 14; i++)
     status.increment_num_successful_commits();
   EXPECT_EQ(14, status.model_neutral_state().num_successful_commits);
 }
 
-TEST_F(StatusControllerTest, HasConflictingUpdates) {
-  StatusController status(routes_);
-  EXPECT_FALSE(status.HasConflictingUpdates());
-
-  {
-    ScopedModelSafeGroupRestriction r(&status, GROUP_UI);
-    status.increment_num_updates_applied();
-    status.mutable_simple_conflict_ids()->insert(syncable::Id());
-  }
-
-  EXPECT_TRUE(status.HasConflictingUpdates());
-}
-
-TEST_F(StatusControllerTest, HasConflictingUpdates_NonBlockingUpdates) {
-  StatusController status(routes_);
-  EXPECT_FALSE(status.HasConflictingUpdates());
-
-  status.increment_num_updates_applied();
-  status.increment_num_encryption_conflicts();
-  EXPECT_TRUE(status.HasConflictingUpdates());
-}
-
 TEST_F(StatusControllerTest, CountUpdates) {
   StatusController status(routes_);
   EXPECT_EQ(0, status.CountUpdates());
   sync_pb::ClientToServerResponse* response(status.mutable_updates_response());
   sync_pb::SyncEntity* entity1 = response->mutable_get_updates()->add_entries();
   sync_pb::SyncEntity* entity2 = response->mutable_get_updates()->add_entries();
   ASSERT_TRUE(entity1 != NULL && entity2 != NULL);
   EXPECT_EQ(2, status.CountUpdates());
 }
 
 // Test TotalNumConflictingItems
 TEST_F(StatusControllerTest, TotalNumConflictingItems) {
   StatusController status(routes_);
-  TestIdFactory f;
-  {
-    ScopedModelSafeGroupRestriction r(&status, GROUP_UI);
-    status.mutable_simple_conflict_ids()->insert(f.NewLocalId());
-    status.mutable_simple_conflict_ids()->insert(f.NewLocalId());
-    EXPECT_EQ(static_cast<size_t>(2), status.simple_conflict_ids()->size());
-  }
-  EXPECT_EQ(2, status.TotalNumConflictingItems());
-  {
-    ScopedModelSafeGroupRestriction r(&status, GROUP_DB);
-    status.mutable_simple_conflict_ids()->insert(f.NewLocalId());
-    status.mutable_simple_conflict_ids()->insert(f.NewLocalId());
-    EXPECT_EQ(static_cast<size_t>(2), status.simple_conflict_ids()->size());
-  }
-  EXPECT_EQ(4, status.TotalNumConflictingItems());
+  EXPECT_EQ(0, status.TotalNumConflictingItems());
 
   status.increment_num_server_conflicts();
-  status.set_num_hierarchy_conflicts(3);
-  EXPECT_EQ(8, status.TotalNumConflictingItems());
+  status.increment_num_hierarchy_conflicts_by(3);
+  status.increment_num_encryption_conflicts_by(2);
+  EXPECT_EQ(6, status.TotalNumConflictingItems());
 }
 
 // Basic test that non group-restricted state accessors don't cause violations.
 TEST_F(StatusControllerTest, Unrestricted) {
   StatusController status(routes_);
   status.model_neutral_state();
   status.download_updates_succeeded();
   status.ServerSaysNothingMoreToDownload();
   status.group_restriction();
 }
 
 }  // namespace sessions
 }  // namespace syncer