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

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

Issue 7822008: [Sync] Remove static initializers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync to head Created 9 years, 4 months 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/build_and_process_conflict_sets_command.cc
diff --git a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc
index 09147d4c95496290fe143b477aca6ccd334a95a2..cd02684dcb852f6bd5d44caff8e9c7272ddccf45 100644
--- a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc
+++ b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc
@@ -341,10 +341,10 @@ class LocallyDeletedPathChecker {
const syncable::Entry& log_entry) {
syncable::Entry parent(trans, syncable::GET_BY_ID, id);
if (!parent.good())
- return syncable::kNullId;
+ return syncable::GetNullId();
syncable::Id parent_id = parent.Get(syncable::PARENT_ID);
if (parent_id == check_id)
- return syncable::kNullId;
+ return syncable::GetNullId();
return parent_id;
}
};
« no previous file with comments | « chrome/browser/sync/engine/apply_updates_command_unittest.cc ('k') | chrome/browser/sync/engine/build_commit_command.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698