Remove unique naming.

chrome/browser/sync/engine/process_updates_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_updates_command.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "chrome/browser/sync/engine/syncer.h"
@@ skipping 116 matching lines @@
 }  // namespace
 
 // TODO(sync): Refactor this code.
 // Process a single update. Will avoid touching global state.
 ServerUpdateProcessingResult ProcessUpdatesCommand::ProcessUpdate(
     const syncable::ScopedDirLookup& dir, const sync_pb::SyncEntity& pb_entry) {
 
   const SyncEntity& entry = *static_cast<const SyncEntity*>(&pb_entry);
   using namespace syncable;
   syncable::Id id = entry.id();
-  SyncName name = SyncerProtoUtil::NameFromSyncEntity(entry);
+  const std::string name =
+      SyncerProtoUtil::NameFromSyncEntity(entry);
 
   WriteTransaction trans(dir, SYNCER, __FILE__, __LINE__);
 
   SyncerUtil::CreateNewEntry(&trans, id);
 
   // We take a two step approach. First we store the entries data in the
   // server fields of a local entry and then move the data to the local fields
   MutableEntry update_entry(&trans, GET_BY_ID, id);
   // TODO(sync): do we need to run ALL these checks, or is a mere version check
   // good enough?
   if (!ReverifyEntry(&trans, entry, &update_entry)) {
     return SUCCESS_PROCESSED;  // the entry has become irrelevant
   }
 
   SyncerUtil::UpdateServerFieldsFromUpdate(&update_entry, entry, name);
 
   if (update_entry.Get(SERVER_VERSION) == update_entry.Get(BASE_VERSION) &&
       !update_entry.Get(IS_UNSYNCED)) {
-      CHECK(SyncerUtil::ServerAndLocalEntriesMatch(
-          &update_entry)) << update_entry;
+      // Previously this was a big issue but at this point we don't really care
+      // that much if things don't match up exactly.
+      LOG_IF(ERROR, !SyncerUtil::ServerAndLocalEntriesMatch(&update_entry))
+          << update_entry;
   }
   return SUCCESS_PROCESSED;
 }
 
 }  // namespace browser_sync