Avoid useless SYNC_CYCLE_CONTINUATION sync cycle

chrome/browser/sync/engine/build_and_process_conflict_sets_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/build_and_process_conflict_sets_command.h"
 
 #include <set>
 #include <string>
 #include <sstream>
 #include <vector>
@@ skipping 17 matching lines @@
 using std::vector;
 
 BuildAndProcessConflictSetsCommand::BuildAndProcessConflictSetsCommand() {}
 BuildAndProcessConflictSetsCommand::~BuildAndProcessConflictSetsCommand() {}
 
 std::set<ModelSafeGroup> BuildAndProcessConflictSetsCommand::GetGroupsToChange(
     const sessions::SyncSession& session) const {
   return session.GetEnabledGroupsWithConflicts();
 }
 
-void BuildAndProcessConflictSetsCommand::ModelChangingExecuteImpl(
+SyncerError BuildAndProcessConflictSetsCommand::ModelChangingExecuteImpl(
     SyncSession* session) {
   session->mutable_status_controller()->update_conflict_sets_built(
       BuildAndProcessConflictSets(session));
+  return NO_ERROR;
 }
 
 bool BuildAndProcessConflictSetsCommand::BuildAndProcessConflictSets(
     SyncSession* session) {
   syncable::ScopedDirLookup dir(session->context()->directory_manager(),
                                 session->context()->account_name());
   if (!dir.good())
     return false;
   bool had_single_direction_sets = false;
   {  // Scope for transaction.
@@ skipping 358 matching lines @@
     LocallyDeletedPathChecker checker;
     if (!checker.CausingConflict(parent, *entry))
       return;
     conflict_progress->MergeSets(entry->Get(syncable::ID),
                                  parent.Get(syncable::ID));
     CrawlDeletedTreeMergingSets(trans, parent, conflict_progress, checker);
   }
 }
 
 }  // namespace browser_sync