| Index: chrome/browser/sync/syncable/syncable_unittest.cc
|
| diff --git a/chrome/browser/sync/syncable/syncable_unittest.cc b/chrome/browser/sync/syncable/syncable_unittest.cc
|
| index 0950ada4462f45df1948981a423491f89ed14b8e..6ce650de9d7760706445d25049bd8a0f6a3f5696 100644
|
| --- a/chrome/browser/sync/syncable/syncable_unittest.cc
|
| +++ b/chrome/browser/sync/syncable/syncable_unittest.cc
|
| @@ -228,7 +228,9 @@ TEST_F(SyncableGeneralTest, ChildrenOps) {
|
| ASSERT_FALSE(e.good()); // Hasn't been written yet.
|
|
|
| EXPECT_FALSE(dir.HasChildren(&rtrans, rtrans.root_id()));
|
| - EXPECT_TRUE(dir.GetFirstChildId(&rtrans, rtrans.root_id()).IsRoot());
|
| + Id child_id;
|
| + EXPECT_TRUE(dir.GetFirstChildId(&rtrans, rtrans.root_id(), &child_id));
|
| + EXPECT_TRUE(child_id.IsRoot());
|
| }
|
|
|
| {
|
| @@ -250,7 +252,9 @@ TEST_F(SyncableGeneralTest, ChildrenOps) {
|
| ASSERT_TRUE(child.good());
|
|
|
| EXPECT_TRUE(dir.HasChildren(&rtrans, rtrans.root_id()));
|
| - EXPECT_EQ(e.Get(ID), dir.GetFirstChildId(&rtrans, rtrans.root_id()));
|
| + Id child_id;
|
| + EXPECT_TRUE(dir.GetFirstChildId(&rtrans, rtrans.root_id(), &child_id));
|
| + EXPECT_EQ(e.Get(ID), child_id);
|
| }
|
|
|
| {
|
| @@ -267,7 +271,9 @@ TEST_F(SyncableGeneralTest, ChildrenOps) {
|
| ASSERT_TRUE(e.good());
|
|
|
| EXPECT_FALSE(dir.HasChildren(&rtrans, rtrans.root_id()));
|
| - EXPECT_TRUE(dir.GetFirstChildId(&rtrans, rtrans.root_id()).IsRoot());
|
| + Id child_id;
|
| + EXPECT_TRUE(dir.GetFirstChildId(&rtrans, rtrans.root_id(), &child_id));
|
| + EXPECT_TRUE(child_id.IsRoot());
|
| }
|
|
|
| dir.SaveChanges();
|
|
|