Remove unique naming.

chrome/browser/sync/engine/build_commit_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/build_commit_command.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "chrome/browser/sync/engine/syncer_proto_util.h"
 #include "chrome/browser/sync/engine/syncer_session.h"
 #include "chrome/browser/sync/engine/syncer_util.h"
 #include "chrome/browser/sync/engine/syncproto.h"
 #include "chrome/browser/sync/syncable/syncable.h"
 #include "chrome/browser/sync/syncable/syncable_changes_version.h"
 #include "chrome/browser/sync/util/sync_types.h"
 
 using std::set;
 using std::string;
 using std::vector;
 using syncable::ExtendedAttribute;
 using syncable::Id;
 using syncable::MutableEntry;
-using syncable::Name;
 
 namespace browser_sync {
 
 BuildCommitCommand::BuildCommitCommand() {}
 BuildCommitCommand::~BuildCommitCommand() {}
 
 void BuildCommitCommand::AddExtensionsActivityToMessage(
     SyncerSession* session, CommitMessage* message) {
   const ExtensionsActivityMonitor::Records& records =
       session->extensions_activity();
@@ skipping 23 matching lines @@
     SyncEntity* sync_entry =
         static_cast<SyncEntity*>(commit_message->add_entries());
     sync_entry->set_id(id);
     MutableEntry meta_entry(session->write_transaction(),
                             syncable::GET_BY_ID,
                             id);
     CHECK(meta_entry.good());
     // This is the only change we make to the entry in this function.
     meta_entry.Put(syncable::SYNCING, true);
 
-    Name name = meta_entry.GetName();
-    CHECK(!name.value().empty());  // Make sure this isn't an update.
-    sync_entry->set_name(name.value());
-    // Set the non_unique_name if we have one.  If we do, the server ignores
+    PathString name = meta_entry.Get(syncable::NON_UNIQUE_NAME);
+    CHECK(!name.empty());  // Make sure this isn't an update.
+    sync_entry->set_name(name);
+
+    // Set the non_unique_name.  If we do, the server ignores
     // the |name| value (using |non_unique_name| instead), and will return
-    // in the CommitResponse a unique name if one is generated.  Even though
-    // we could get away with only sending |name|, we send both because it
-    // may aid in logging.
-    if (name.value() != name.non_unique_value()) {
-      sync_entry->set_non_unique_name(name.non_unique_value());
-    }
+    // in the CommitResponse a unique name if one is generated.
+    // We send both because it may aid in logging.
+    sync_entry->set_non_unique_name(name);
+
     // Deleted items with negative parent ids can be a problem so we set the
     // parent to 0. (TODO(sync): Still true in protocol?).
     Id new_parent_id;
     if (meta_entry.Get(syncable::IS_DEL) &&
         !meta_entry.Get(syncable::PARENT_ID).ServerKnows()) {
       new_parent_id = session->write_transaction()->root_id();
     } else {
       new_parent_id = meta_entry.Get(syncable::PARENT_ID);
     }
     sync_entry->set_parent_id(new_parent_id);
@@ skipping 56 matching lines @@
         SyncerProtoUtil::CopyBlobIntoProtoBytes(
             meta_entry.Get(syncable::BOOKMARK_FAVICON),
             bookmark->mutable_bookmark_favicon());
       }
     }
   }
   session->set_commit_message(message);
 }
 
 }  // namespace browser_sync