| Index: components/sync/engine_impl/get_commit_ids.cc
|
| diff --git a/components/sync/engine_impl/get_commit_ids.cc b/components/sync/engine_impl/get_commit_ids.cc
|
| index 0baa11efe67b9950d2d9540165559b1cd7a5b959..4207a2637e5e4c92b1a26582249ef9d7e94ca521 100644
|
| --- a/components/sync/engine_impl/get_commit_ids.cc
|
| +++ b/components/sync/engine_impl/get_commit_ids.cc
|
| @@ -150,7 +150,8 @@ bool MayEntryCommit(ModelTypeSet requested_types,
|
| // Extra validity checks.
|
| syncable::Id id = entry.GetId();
|
| if (id == entry.GetParentId()) {
|
| - CHECK(id.IsRoot()) << "Non-root item is self parenting." << entry;
|
| + // Non-root item is self parenting.|entry|.
|
| + CHECK(id.IsRoot());
|
| // If the root becomes unsynced it can cause us problems.
|
| NOTREACHED() << "Root item became unsynced " << entry;
|
| return false;
|
| @@ -191,7 +192,8 @@ void ExcludeDeletedAncestors(
|
|
|
| while (!parent_id.IsRoot()) {
|
| syncable::Entry parent(trans, syncable::GET_BY_ID, parent_id);
|
| - CHECK(parent.good()) << "Bad user-only parent in item path.";
|
| + // Bad user-only parent in item path.
|
| + CHECK(parent.good());
|
| int64_t handle = parent.GetMetahandle();
|
|
|
| if (!parent.GetIsDel())
|
| @@ -366,7 +368,8 @@ void Traversal::AddUncommittedParents(
|
| // Climb the tree adding entries leaf -> root.
|
| while (!parent_id.ServerKnows()) {
|
| syncable::Entry parent(trans_, syncable::GET_BY_ID, parent_id);
|
| - CHECK(parent.good()) << "Bad user-only parent in item path.";
|
| + // Bad user-only parent in item path.
|
| + CHECK(parent.good());
|
| int64_t handle = parent.GetMetahandle();
|
| if (HaveItem(handle)) {
|
| // We've already added this parent (and therefore all of its parents).
|
|
|