| Index: chrome/browser/sync/internal_api/base_node.cc
|
| diff --git a/chrome/browser/sync/internal_api/base_node.cc b/chrome/browser/sync/internal_api/base_node.cc
|
| index 2aa212c98aab427db77e477521e3f75db3e9b184..31c039d4576dd73267a1b25ce3d5d5bb969564f5 100644
|
| --- a/chrome/browser/sync/internal_api/base_node.cc
|
| +++ b/chrome/browser/sync/internal_api/base_node.cc
|
| @@ -224,8 +224,11 @@ int64 BaseNode::GetSuccessorId() const {
|
| int64 BaseNode::GetFirstChildId() const {
|
| syncable::Directory* dir = GetTransaction()->GetLookup();
|
| syncable::BaseTransaction* trans = GetTransaction()->GetWrappedTrans();
|
| - syncable::Id id_string =
|
| - dir->GetFirstChildId(trans, GetEntry()->Get(syncable::ID));
|
| + syncable::Id id_string;
|
| + // TODO(akalin): Propagate up the error further (see
|
| + // http://crbug.com/100907).
|
| + CHECK(dir->GetFirstChildId(trans,
|
| + GetEntry()->Get(syncable::ID), &id_string));
|
| if (id_string.IsRoot())
|
| return kInvalidId;
|
| return IdToMetahandle(GetTransaction()->GetWrappedTrans(), id_string);
|
|
|