Remove unique naming.

chrome/browser/sync/engine/verify_updates_command.cc

 // 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.
 //
 
 #include "chrome/browser/sync/engine/verify_updates_command.h"
 
 #include "chrome/browser/sync/engine/syncer.h"
 #include "chrome/browser/sync/engine/syncer_proto_util.h"
 #include "chrome/browser/sync/engine/syncer_types.h"
@@ skipping 50 matching lines @@
 
   if (!id.ServerKnows()) {
     LOG(ERROR) << "Illegal negative id in received updates";
     return VERIFY_FAIL;
   }
   if (!entry.parent_id().ServerKnows()) {
     LOG(ERROR) << "Illegal parent id in received updates";
     return VERIFY_FAIL;
   }
   {
-    SyncName name = SyncerProtoUtil::NameFromSyncEntity(entry);
-    if ((name.value().empty() || name.non_unique_value().empty()) &&
-        !deleted) {
+    const std::string name = SyncerProtoUtil::NameFromSyncEntity(entry);
+    if (name.empty() && !deleted) {
       LOG(ERROR) << "Zero length name in non-deleted update";
       return VERIFY_FAIL;
     }
   }
 
   syncable::MutableEntry same_id(trans, GET_BY_ID, id);
   VerifyResult result = VERIFY_UNDECIDED;
   result = SyncerUtil::VerifyNewEntry(entry, &same_id, deleted);
 
   if (VERIFY_UNDECIDED == result) {
     if (deleted)
       result = VERIFY_SUCCESS;
   }
 
   // If we have an existing entry, we check here for updates that break
   // consistency rules.
   if (VERIFY_UNDECIDED == result) {
     result = SyncerUtil::VerifyUpdateConsistency(trans, entry, &same_id,
       deleted, is_directory, is_bookmark);
   }
 
   if (VERIFY_UNDECIDED == result)
     return VERIFY_SUCCESS;  // No news is good news.
   else
     return result;  // This might be VERIFY_SUCCESS as well
 }
 
 }  // namespace browser_sync