sync: Remove ModelNeutralExecuteImpl()

chrome/browser/sync/engine/process_commit_response_command.cc

 // Copyright (c) 2011 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 "chrome/browser/sync/engine/process_commit_response_command.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 41 matching lines @@
 void IncrementErrorCounters(StatusController* status) {
   status->increment_num_consecutive_errors();
 }
 void ResetErrorCounters(StatusController* status) {
   status->set_num_consecutive_errors(0);
 }
 
 ProcessCommitResponseCommand::ProcessCommitResponseCommand() {}
 ProcessCommitResponseCommand::~ProcessCommitResponseCommand() {}
 
-bool ProcessCommitResponseCommand::ModelNeutralExecuteImpl(
+void ProcessCommitResponseCommand::ExecuteImpl(
+    sessions::SyncSession* session) {
+  if (ModelNeutralShouldExitEarly(session))
+    return;
+
+  ModelChangingSyncerCommand::ExecuteImpl(session);
+}
+
+bool ProcessCommitResponseCommand::ModelNeutralShouldExitEarly(
     sessions::SyncSession* session) {
   ScopedDirLookup dir(session->context()->directory_manager(),
                       session->context()->account_name());
   if (!dir.good()) {
     LOG(ERROR) << "Scoped dir lookup failed!";
-    return false;
+    return true;
   }
 
   StatusController* status = session->status_controller();
   const ClientToServerResponse& response(status->commit_response());
   const vector<syncable::Id>& commit_ids(status->commit_ids());
 
   if (!response.has_commit()) {
     // TODO(sync): What if we didn't try to commit anything?
     LOG(WARNING) << "Commit response has no commit body!";
     IncrementErrorCounters(status);
-    return false;
+    return true;
   }
 
   const CommitResponse& cr = response.commit();
   int commit_count = commit_ids.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();
     }
     IncrementErrorCounters(status);
-    return false;
+    return true;
   }
-  return true;
+  return false;
 }
 
 void ProcessCommitResponseCommand::ModelChangingExecuteImpl(
     SyncSession* session) {
   ProcessCommitResponse(session);
   ExtensionsActivityMonitor* monitor = session->context()->extensions_monitor();
   if (session->status_controller()->HasBookmarkCommitActivity() &&
       session->status_controller()->syncer_status()
           .num_successful_bookmark_commits == 0) {
     monitor->PutRecords(session->extensions_activity());
@@ skipping 378 matching lines @@
   // 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));
   }
 }
 
 }  // namespace browser_sync