| Index: chrome/browser/sync/engine/conflict_resolver.cc
|
| diff --git a/chrome/browser/sync/engine/conflict_resolver.cc b/chrome/browser/sync/engine/conflict_resolver.cc
|
| index 60c7660eb03b051a226e6d8d339ff5dcf4248ccf..60fb6e813c5e501ec40d4eb42488dcfaadad5ae8 100644
|
| --- a/chrome/browser/sync/engine/conflict_resolver.cc
|
| +++ b/chrome/browser/sync/engine/conflict_resolver.cc
|
| @@ -130,9 +130,9 @@ ConflictResolver::ProcessSimpleConflict(WriteTransaction* trans,
|
| // If a server deleted folder has local contents we should be in a set.
|
| if (entry.Get(syncable::IS_DIR)) {
|
| Directory::ChildHandles children;
|
| - trans->directory()->GetChildHandles(trans,
|
| - entry.Get(syncable::ID),
|
| - &children);
|
| + trans->directory()->GetChildHandlesById(trans,
|
| + entry.Get(syncable::ID),
|
| + &children);
|
| if (0 != children.size()) {
|
| VLOG(1) << "Entry is a server deleted directory with local contents, "
|
| "should be in a set. (race condition).";
|
|
|