| Index: sync/sessions/session_state.cc
 | 
| diff --git a/sync/sessions/session_state.cc b/sync/sessions/session_state.cc
 | 
| index f5d1709ed631695aeff7fcc346b34dbd51896788..a08b093c9e616fc0993e2c72c930f18125bae493 100644
 | 
| --- a/sync/sessions/session_state.cc
 | 
| +++ b/sync/sessions/session_state.cc
 | 
| @@ -16,63 +16,6 @@ using std::vector;
 | 
|  namespace syncer {
 | 
|  namespace sessions {
 | 
|  
 | 
| -UpdateProgress::UpdateProgress() {}
 | 
| -
 | 
| -UpdateProgress::~UpdateProgress() {}
 | 
| -
 | 
| -void UpdateProgress::AddVerifyResult(const VerifyResult& verify_result,
 | 
| -                                     const sync_pb::SyncEntity& entity) {
 | 
| -  verified_updates_.push_back(std::make_pair(verify_result, entity));
 | 
| -}
 | 
| -
 | 
| -void UpdateProgress::AddAppliedUpdate(const UpdateAttemptResponse& response,
 | 
| -    const syncable::Id& id) {
 | 
| -  applied_updates_.push_back(std::make_pair(response, id));
 | 
| -}
 | 
| -
 | 
| -std::vector<AppliedUpdate>::iterator UpdateProgress::AppliedUpdatesBegin() {
 | 
| -  return applied_updates_.begin();
 | 
| -}
 | 
| -
 | 
| -std::vector<VerifiedUpdate>::const_iterator
 | 
| -UpdateProgress::VerifiedUpdatesBegin() const {
 | 
| -  return verified_updates_.begin();
 | 
| -}
 | 
| -
 | 
| -std::vector<AppliedUpdate>::const_iterator
 | 
| -UpdateProgress::AppliedUpdatesEnd() const {
 | 
| -  return applied_updates_.end();
 | 
| -}
 | 
| -
 | 
| -std::vector<VerifiedUpdate>::const_iterator
 | 
| -UpdateProgress::VerifiedUpdatesEnd() const {
 | 
| -  return verified_updates_.end();
 | 
| -}
 | 
| -
 | 
| -int UpdateProgress::SuccessfullyAppliedUpdateCount() const {
 | 
| -  int count = 0;
 | 
| -  for (std::vector<AppliedUpdate>::const_iterator it =
 | 
| -       applied_updates_.begin();
 | 
| -       it != applied_updates_.end();
 | 
| -       ++it) {
 | 
| -    if (it->first == SUCCESS)
 | 
| -      count++;
 | 
| -  }
 | 
| -  return count;
 | 
| -}
 | 
| -
 | 
| -// Returns true if at least one update application failed due to a conflict
 | 
| -// during this sync cycle.
 | 
| -bool UpdateProgress::HasConflictingUpdates() const {
 | 
| -  std::vector<AppliedUpdate>::const_iterator it;
 | 
| -  for (it = applied_updates_.begin(); it != applied_updates_.end(); ++it) {
 | 
| -    if (it->first != SUCCESS) {
 | 
| -      return true;
 | 
| -    }
 | 
| -  }
 | 
| -  return false;
 | 
| -}
 | 
| -
 | 
|  PerModelSafeGroupState::PerModelSafeGroupState() {
 | 
|  }
 | 
|  
 | 
| 
 |