| 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;
|
| }
|
| };
|
|
|