Remove single direction conflict set code

chrome/browser/sync/engine/build_and_process_conflict_sets_command.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_ENGINE_BUILD_AND_PROCESS_CONFLICT_SETS_COMMAND_H_
 #define CHROME_BROWSER_SYNC_ENGINE_BUILD_AND_PROCESS_CONFLICT_SETS_COMMAND_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 25 matching lines @@
   virtual ~BuildAndProcessConflictSetsCommand();
 
  protected:
   // ModelChangingSyncerCommand implementation.
   virtual std::set<ModelSafeGroup> GetGroupsToChange(
       const sessions::SyncSession& session) const OVERRIDE;
   virtual SyncerError ModelChangingExecuteImpl(
       sessions::SyncSession* session) OVERRIDE;
 
  private:
-  bool BuildAndProcessConflictSets(sessions::SyncSession* session);
-
-  bool ProcessSingleDirectionConflictSets(
-      syncable::WriteTransaction* trans, ConflictResolver* resolver,
-      Cryptographer* cryptographer, sessions::StatusController* status,
-      const ModelSafeRoutingInfo& routes);
-  bool ApplyUpdatesTransactionally(
-      syncable::WriteTransaction* trans,
-      const std::vector<syncable::Id>* const update_set,
-      ConflictResolver* resolver,
-      Cryptographer* cryptographer,
-      const ModelSafeRoutingInfo& routes,
-      sessions::StatusController* status);
   void BuildConflictSets(syncable::BaseTransaction* trans,
                          sessions::ConflictProgress* conflict_progress);
 
-  void MergeSetsForNameClash(syncable::BaseTransaction* trans,
-                             syncable::Entry* entry,
-                             sessions::ConflictProgress* conflict_progress);
   void MergeSetsForIntroducedLoops(syncable::BaseTransaction* trans,
       syncable::Entry* entry,
       sessions::ConflictProgress* conflict_progress);
   void MergeSetsForNonEmptyDirectories(syncable::BaseTransaction* trans,
       syncable::Entry* entry,
       sessions::ConflictProgress* conflict_progress);
   void MergeSetsForPositionUpdate(syncable::BaseTransaction* trans,
       syncable::Entry* entry,
       sessions::ConflictProgress* conflict_progress);
 
   DISALLOW_COPY_AND_ASSIGN(BuildAndProcessConflictSetsCommand);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_ENGINE_BUILD_AND_PROCESS_CONFLICT_SETS_COMMAND_H_