Remove unique naming.

chrome/browser/sync/engine/syncer_util.h

 // Copyright (c) 2006-2008 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.
 //
 // Utility functions manipulating syncable::Entries, intended for use by the
 // syncer.
 
 #ifndef CHROME_BROWSER_SYNC_ENGINE_SYNCER_UTIL_H_
 #define CHROME_BROWSER_SYNC_ENGINE_SYNCER_UTIL_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "build/build_config.h"
 #include "chrome/browser/sync/engine/syncer.h"
 #include "chrome/browser/sync/engine/syncer_types.h"
 #include "chrome/browser/sync/syncable/syncable.h"
 #include "chrome/browser/sync/syncable/syncable_id.h"
 #include "chrome/browser/sync/util/path_helpers.h"
 #include "chrome/browser/sync/util/sync_types.h"
 
 namespace browser_sync {
 
 class SyncEntity;
 
 class SyncerUtil {
  public:
-  // TODO(ncarter): Remove unique-in-parent title support and name conflicts.
-  static syncable::Id GetNameConflictingItemId(
-      syncable::BaseTransaction* trans,
-      const syncable::Id& parent_id,
-      const PathString& server_name);
-
   static void ChangeEntryIDAndUpdateChildren(
       syncable::WriteTransaction* trans,
       syncable::MutableEntry* entry,
       const syncable::Id& new_id,
       syncable::Directory::ChildHandles* children);
 
   // Returns the number of unsynced entries.
   static int GetUnsyncedEntries(syncable::BaseTransaction* trans,
                                 std::vector<int64> *handles);
 
   static void ChangeEntryIDAndUpdateChildren(syncable::WriteTransaction* trans,
                                              syncable::MutableEntry* entry,
                                              const syncable::Id& new_id);
 
   static void AttemptReuniteLostCommitResponses(
       syncable::WriteTransaction* trans,
       const SyncEntity& server_entry,
       const std::string& client_id);
 
   static UpdateAttemptResponse AttemptToUpdateEntry(
       syncable::WriteTransaction* const trans,
       syncable::MutableEntry* const entry,
       ConflictResolver* resolver);
 
-  static UpdateAttemptResponse AttemptToUpdateEntryWithoutMerge(
-      syncable::WriteTransaction* const trans,
-      syncable::MutableEntry* const entry,
-      syncable::Id* const conflicting_id);
 
   // Pass in name to avoid redundant UTF8 conversion.
   static void UpdateServerFieldsFromUpdate(
       syncable::MutableEntry* local_entry,
       const SyncEntity& server_entry,
-      const syncable::SyncName& name);
+      const PathString& name);
 
   static void ApplyExtendedAttributes(
       syncable::MutableEntry* local_entry,
       const SyncEntity& server_entry);
 
   // Creates a new Entry iff no Entry exists with the given id.
   static void CreateNewEntry(syncable::WriteTransaction *trans,
                              const syncable::Id& id);
 
   static bool ServerAndLocalEntriesMatch(syncable::Entry* entry);
@@ skipping 100 matching lines @@
 // As we truncate server times on the client for posix and on the server for
 // windows we need two ClientAndServerTimeMatch fucntions.
 inline bool ClientAndServerTimeMatch(int64 client_time, int64 server_time) {
   // Compare at the coarser timescale (client)
   return client_time == ServerTimeToClientTime(server_time);
 }
 #else
 // The sync server uses Java Times (ms since 1970)
 // and the client uses FILETIMEs (ns since 1601) so we need to convert
 // between the timescales.
+// TODO(sync): Fix this. No need to use two timescales.
 inline int64 ServerTimeToClientTime(int64 server_time) {
   return server_time * GG_LONGLONG(10000) + GG_LONGLONG(116444736000000000);
 }
 
 inline int64 ClientTimeToServerTime(int64 client_time) {
   return (client_time - GG_LONGLONG(116444736000000000)) / GG_LONGLONG(10000);
 }
 
 inline bool ClientAndServerTimeMatch(int64 client_time, int64 server_time) {
   // Compare at the coarser timescale (server)
   return ClientTimeToServerTime(client_time) == server_time;
 }
 #endif
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_ENGINE_SYNCER_UTIL_H_