sync: Merge {Verify,Process}UpdatesCommand

sync/sessions/sync_session.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 <algorithm>
 #include <iterator>
 
 #include "base/logging.h"
@@ skipping 204 matching lines @@
            enabled_groups.begin(); it != enabled_groups.end(); ++it) {
     const std::set<syncable::Id>* ids =
         status_controller_->GetUnrestrictedSimpleConflictIds(*it);
     if (ids && ids->size() > 0) {
       enabled_groups_with_conflicts.insert(*it);
     }
   }
   return enabled_groups_with_conflicts;
 }
 
-std::set<ModelSafeGroup>
-    SyncSession::GetEnabledGroupsWithVerifiedUpdates() const {
-  const std::set<ModelSafeGroup>& enabled_groups = GetEnabledGroups();
-  std::set<ModelSafeGroup> enabled_groups_with_verified_updates;
-  for (std::set<ModelSafeGroup>::const_iterator it =
-           enabled_groups.begin(); it != enabled_groups.end(); ++it) {
-    const UpdateProgress* update_progress =
-        status_controller_->GetUnrestrictedUpdateProgress(*it);
-    if (update_progress &&
-        (update_progress->VerifiedUpdatesBegin() !=
-         update_progress->VerifiedUpdatesEnd())) {
-      enabled_groups_with_verified_updates.insert(*it);
-    }
-  }
-
-  return enabled_groups_with_verified_updates;
-}
-
 namespace {
 
 // Returns false iff one of the command results had an error.
 bool HadErrors(const ModelNeutralState& state) {
   const bool get_key_error = SyncerErrorIsError(state.last_get_key_result);
   const bool download_updates_error =
       SyncerErrorIsError(state.last_download_updates_result);
   const bool commit_error = SyncerErrorIsError(state.commit_result);
   return get_key_error || download_updates_error || commit_error;
 }
@@ skipping 13 matching lines @@
   // with the server. Therefore, we verify no errors and at least one SYNCER_OK.
   return reached_server && !HadErrors(state);
 }
 
 void SyncSession::SetFinished() {
   finished_ = true;
 }
 
 }  // namespace sessions
 }  // namespace syncer