Remove unique naming.

chrome/browser/sync/engine/process_commit_response_command.cc

 // Copyright (c) 2006-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.
 
 #include "chrome/browser/sync/engine/process_commit_response_command.h"
 
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "chrome/browser/sync/engine/syncer_proto_util.h"
 #include "chrome/browser/sync/engine/syncer_session.h"
 #include "chrome/browser/sync/engine/syncer_status.h"
 #include "chrome/browser/sync/engine/syncer_util.h"
 #include "chrome/browser/sync/engine/syncproto.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/browser/sync/syncable/syncable.h"
 
 using syncable::ScopedDirLookup;
 using syncable::WriteTransaction;
 using syncable::MutableEntry;
 using syncable::Entry;
-using syncable::Name;
-using syncable::SyncName;
-using syncable::DBName;
 
 using std::set;
 using std::vector;
 
 using syncable::BASE_VERSION;
 using syncable::GET_BY_ID;
 using syncable::ID;
 using syncable::IS_DEL;
 using syncable::IS_DIR;
 using syncable::IS_UNAPPLIED_UPDATE;
@@ skipping 81 matching lines @@
           ProcessSingleCommitResponse(&trans, cr.entryresponse(i),
                                       commit_ids[i],
                                       &conflicting_new_folder_ids,
                                       &deleted_folders, session);
       switch (response_type) {
         case CommitResponse::INVALID_MESSAGE:
           ++error_commits;
           break;
         case CommitResponse::CONFLICT:
           ++conflicting_commits;
+          // This is important to activate conflict resolution.
           session->AddCommitConflict(commit_ids[i]);
           break;
         case CommitResponse::SUCCESS:
           // TODO(sync): worry about sync_rate_ rate calc?
           ++successes;
           status.increment_successful_commits();
           break;
         case CommitResponse::OVER_QUOTA:
           over_quota = true;
           // We handle over quota like a retry, which is same as transient.
@@ skipping 195 matching lines @@
   }
   if (local_entry->Get(IS_DIR) && local_entry->Get(IS_DEL)) {
     deleted_folders->insert(local_entry->Get(ID));
   }
 }
 
 void ProcessCommitResponseCommand::PerformCommitTimeNameAside(
     syncable::WriteTransaction* trans,
     const CommitResponse_EntryResponse& server_entry,
     syncable::MutableEntry* local_entry) {
-  Name old_name(local_entry->GetName());
-
-  // Ensure that we don't collide with an existing entry.
-  SyncName server_name =
+  PathString old_name = local_entry->Get(syncable::NON_UNIQUE_NAME);
+  const string server_name =
       SyncerProtoUtil::NameFromCommitEntryResponse(server_entry);
 
-  LOG(INFO) << "Server provided committed name:" << server_name.value();
-  if (!server_name.value().empty() &&
-      static_cast<SyncName&>(old_name) != server_name) {
-    LOG(INFO) << "Server name differs from local name, attempting"
-              << " commit time name aside.";
-
-    DBName db_name(server_name.value());
-    db_name.MakeOSLegal();
-
-    // This is going to produce ~1 names instead of (Edited) names.
-    // Since this should be EXTREMELY rare, we do this for now.
-    db_name.MakeNoncollidingForEntry(trans, local_entry->Get(SERVER_PARENT_ID),
-                                     local_entry);
-
-    CHECK(!db_name.empty());
-
-    LOG(INFO) << "Server commit moved aside entry: " << old_name.db_value()
-              << " to new name " << db_name;
-
+  if (!server_name.empty() && old_name != server_name) {
+    LOG(INFO) << "Server commit moved aside entry: " << old_name
+              << " to new name " << server_name;
     // Should be safe since we're in a "commit lock."
-    local_entry->PutName(Name::FromDBNameAndSyncName(db_name, server_name));
+    local_entry->Put(syncable::NON_UNIQUE_NAME, server_name);
   }
 }
 
 }  // namespace browser_sync