Refactor following sync commit loop change

sync/engine/process_commit_response_command.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/engine/process_commit_response_command.h"
 
 #include <cstddef>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 56 matching lines @@
   syncable::ReadTransaction trans(FROM_HERE, dir);
   for (size_t i = 0; i < commit_set_.Size(); ++i) {
     groups_with_commits.insert(
         GetGroupForModelType(commit_set_.GetModelTypeAt(i),
                              session.routing_info()));
   }
 
   return groups_with_commits;
 }
 
-SyncerError ProcessCommitResponseCommand::ModelNeutralExecuteImpl(
-    SyncSession* session) {
-  syncable::Directory* dir = session->context()->directory();
-  const vector<syncable::Id>& commit_ids = commit_set_.GetAllCommitIds();
-
-  if (!commit_response_.has_commit()) {
-    LOG(WARNING) << "Commit response has no commit body!";
-    ClearSyncingBits(dir, commit_ids);
-    return SERVER_RESPONSE_VALIDATION_FAILED;
-  }
-
-  const CommitResponse& cr = commit_response_.commit();
-  int commit_count = commit_set_.Size();
-  if (cr.entryresponse_size() != commit_count) {
-    LOG(ERROR) << "Commit response has wrong number of entries! Expected:" <<
-               commit_count << " Got:" << cr.entryresponse_size();
-    for (int i = 0 ; i < cr.entryresponse_size() ; i++) {
-      LOG(ERROR) << "Response #" << i << " Value: " <<
-                 cr.entryresponse(i).response_type();
-      if (cr.entryresponse(i).has_error_message())
-        LOG(ERROR) << "  " << cr.entryresponse(i).error_message();
-    }
-    ClearSyncingBits(dir, commit_ids);
-    return SERVER_RESPONSE_VALIDATION_FAILED;
-  }
-  return SYNCER_OK;
-}
 
 SyncerError ProcessCommitResponseCommand::ModelChangingExecuteImpl(
     SyncSession* session) {
   SyncerError result = ProcessCommitResponse(session);
   ExtensionsActivityMonitor* monitor = session->context()->extensions_monitor();
 
   // This is to be run on one model only: the bookmark model.
   if (session->status_controller().HasBookmarkCommitActivity()) {
     // If the commit failed, return the data to the ExtensionsActivityMonitor.
     if (session->status_controller().syncer_status()
@@ skipping 379 matching lines @@
   // Make a note of any deleted folders, whose children would have
   // been recursively deleted.
   // TODO(nick): Here, commit_message.deleted() would be more correct than
   // local_entry->Get(IS_DEL).  For example, an item could be renamed, and then
   // deleted during the commit of the rename.  Unit test & fix.
   if (local_entry->Get(IS_DIR) && local_entry->Get(IS_DEL)) {
     deleted_folders->insert(local_entry->Get(ID));
   }
 }
 
-void ProcessCommitResponseCommand::ClearSyncingBits(
-    syncable::Directory *dir,
-    const vector<syncable::Id>& commit_ids) {
-  // This is part of the cleanup in the case of a failed commit.  Normally we
-  // would unset the SYNCING bit when processing the commit response.  In the
-  // failure case we don't process the response, so we need to clear those bits
-  // here.
-  syncable::WriteTransaction trans(FROM_HERE, syncable::SYNCER, dir);
-  for (size_t i = 0; i < commit_ids.size(); i++) {
-    syncable::MutableEntry entry(&trans, syncable::GET_BY_ID, commit_ids[i]);
-    if (entry.good()) {
-      entry.Put(syncable::SYNCING, false);
-    } else {
-      LOG(WARNING) << "Id: " << commit_ids[i] << " disappeared";
-    }
-  }
-}
-
 }  // namespace browser_sync