Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1022)

Unified Diff: chrome/browser/sync/engine/verify_updates_command.cc

Issue 371029: Remove unique naming. (Closed)
Patch Set: Ready and about to go in! Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/engine/verify_updates_command.cc
diff --git a/chrome/browser/sync/engine/verify_updates_command.cc b/chrome/browser/sync/engine/verify_updates_command.cc
index 83d0257f3b1cc682ed6a20e4cb51fb5ad61374a7..216eff52e4645c0761b4972ada67b0c3d4a24223 100644
--- a/chrome/browser/sync/engine/verify_updates_command.cc
+++ b/chrome/browser/sync/engine/verify_updates_command.cc
@@ -68,9 +68,8 @@ VerifyResult VerifyUpdatesCommand::VerifyUpdate(
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;
}
« no previous file with comments | « chrome/browser/sync/engine/update_applicator.cc ('k') | chrome/browser/sync/syncable/directory_backing_store.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698