Remove unique naming.

chrome/browser/sync/engine/syncer_types.h

 // Copyright (c) 2009 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_SYNCER_TYPES_H_
 #define CHROME_BROWSER_SYNC_ENGINE_SYNCER_TYPES_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 13 matching lines @@
 class SyncerSession;
 class Syncer;
 
 enum UpdateAttemptResponse {
   // Update was applied or safely ignored.
   SUCCESS,
 
   // Conflicts with the local data representation. This can also mean that the
   // entry doesn't currently make sense if we applied it.
   CONFLICT,
-
-  // This return value is only returned by AttemptToUpdateEntryWithoutMerge
-  // if we have a name conflict. Users of AttemptToUpdateEntry should never
-  // see this return value, we'll return CONFLICT.
-  NAME_CONFLICT,
 };
 
 enum ServerUpdateProcessingResult {
   // Success. Update applied and stored in SERVER_* fields or dropped if
   // irrelevant.
   SUCCESS_PROCESSED,
 
   // Success. Update details stored in SERVER_* fields, but wasn't applied.
   SUCCESS_STORED,
 
@@ skipping 85 matching lines @@
 // one sync loop. It lives on the stack. We don't expose the number of
 // conflicts during SyncShare as the conflicts may be solved automatically
 // by the conflict resolver.
 typedef std::vector<syncable::Id> ConflictSet;
 
 typedef std::map<syncable::Id, ConflictSet*> IdToConflictSetMap;
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_ENGINE_SYNCER_TYPES_H_