sync: Remove UpdateProgress and related code

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 27 matching lines @@
   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);
-    EXPECT_FALSE(status.update_progress());
-    status.mutable_update_progress()->AddAppliedUpdate(SUCCESS,
-        syncable::Id());
-    status.mutable_update_progress()->AddAppliedUpdate(CONFLICT_SIMPLE,
-        syncable::Id());
-    EXPECT_TRUE(status.update_progress()->HasConflictingUpdates());
+    status.increment_num_updates_applied();
+    status.mutable_simple_conflict_ids()->insert(syncable::Id());
   }
 
   EXPECT_TRUE(status.HasConflictingUpdates());
-
-  {
-    ScopedModelSafeGroupRestriction r(&status, GROUP_PASSIVE);
-    EXPECT_FALSE(status.update_progress());
-  }
 }
 
 TEST_F(StatusControllerTest, HasConflictingUpdates_NonBlockingUpdates) {
   StatusController status(routes_);
   EXPECT_FALSE(status.HasConflictingUpdates());
-  {
-    ScopedModelSafeGroupRestriction r(&status, GROUP_UI);
-    EXPECT_FALSE(status.update_progress());
-    status.mutable_update_progress()->AddAppliedUpdate(SUCCESS,
-        syncable::Id());
-    status.mutable_update_progress()->AddAppliedUpdate(CONFLICT_HIERARCHY,
-        syncable::Id());
-    EXPECT_TRUE(status.update_progress()->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);
@@ skipping 20 matching lines @@
   EXPECT_EQ(4, status.TotalNumConflictingItems());
 
   status.increment_num_server_conflicts();
   status.set_num_hierarchy_conflicts(3);
   EXPECT_EQ(8, status.TotalNumConflictingItems());
 }
 
 // Basic test that non group-restricted state accessors don't cause violations.
 TEST_F(StatusControllerTest, Unrestricted) {
   StatusController status(routes_);
-  const UpdateProgress* progress =
-      status.GetUnrestrictedUpdateProgress(GROUP_UI);
-  EXPECT_FALSE(progress);
   status.model_neutral_state();
   status.download_updates_succeeded();
   status.ServerSaysNothingMoreToDownload();
   status.group_restriction();
 }
 
 }  // namespace sessions
 }  // namespace syncer