Remove unique naming.

chrome/browser/sync/engine/conflict_resolver.h

Index: chrome/browser/sync/engine/conflict_resolver.h
diff --git a/chrome/browser/sync/engine/conflict_resolver.h b/chrome/browser/sync/engine/conflict_resolver.h
old mode 100644
new mode 100755
index 3ba0db13b3b5c081dc27563474ba1e7ae4b5e0a4..779e12302678587c2256aa73d71ea7211a7123af
--- a/chrome/browser/sync/engine/conflict_resolver.h
+++ b/chrome/browser/sync/engine/conflict_resolver.h
@@ -41,13 +41,6 @@ class ConflictResolver {
                         ConflictResolutionView* view,
                         SyncerSession* session);
 
-  // Called by ProcessServerClientNameClash. Returns true if it's merged the
-  // items, false otherwise. Does not re-check preconditions covered in
-  // ProcessServerClientNameClash (i.e. it assumes a name clash).
-  bool AttemptItemMerge(syncable::WriteTransaction* trans,
-                        syncable::MutableEntry* local_entry,
-                        syncable::MutableEntry* server_entry);
-
  private:
   // We keep a map to record how often we've seen each conflict set. We use this
   // to screen out false positives caused by transient server or client states,
@@ -62,13 +55,6 @@ class ConflictResolver {
     SYNC_PROGRESS,     // Progress made.
   };
 
-  enum ServerClientNameClashReturn {
-    NO_CLASH,
-    SOLUTION_DEFERRED,
-    SOLVED,
-    BOGUS_SET,
-  };
-
   // Get a key for the given set. NOTE: May reorder set contents. The key is
   // currently not very efficient, but will ease debugging.
   ConflictSetCountMapKey GetSetKey(ConflictSet* conflict_set);
@@ -91,20 +77,6 @@ class ConflictResolver {
                           int conflict_count,
                           SyncerSession* session);
 
-  // Gives any unsynced entries in the given set new names if possible.
-  bool RenameUnsyncedEntries(syncable::WriteTransaction* trans,
-                             ConflictSet* conflict_set);
-
-  ServerClientNameClashReturn ProcessServerClientNameClash(
-      syncable::WriteTransaction* trans,
-      syncable::MutableEntry* locally_named,
-      syncable::MutableEntry* server_named,
-      SyncerSession* session);
-  ServerClientNameClashReturn ProcessNameClashesInSet(
-      syncable::WriteTransaction* trans,
-      ConflictSet* conflict_set,
-      SyncerSession* session);
-
   // Returns true if we're stuck.
   template <typename InputIt>
   bool LogAndSignalIfConflictStuck(syncable::BaseTransaction* trans,