| Index: sync/engine/syncer_unittest.cc
|
| diff --git a/sync/engine/syncer_unittest.cc b/sync/engine/syncer_unittest.cc
|
| index b88feb3e14a42c84b3caee87b2b2ecfac8372037..17be6656c07132dee2719d2083a471835ec1f8c9 100644
|
| --- a/sync/engine/syncer_unittest.cc
|
| +++ b/sync/engine/syncer_unittest.cc
|
| @@ -85,7 +85,8 @@ using syncable::CREATE;
|
| using syncable::GET_BY_HANDLE;
|
| using syncable::GET_BY_ID;
|
| using syncable::GET_BY_CLIENT_TAG;
|
| -using syncable::GET_BY_SERVER_TAG;
|
| +using syncable::GET_BY_SERVER_TAG_DEPRECATED;
|
| +using syncable::GET_TYPE_ROOT;
|
| using syncable::UNITTEST;
|
|
|
| using sessions::MockDebugInfoGetter;
|
| @@ -4140,9 +4141,9 @@ TEST_F(SyncerTest, UniqueServerTagUpdates) {
|
| ASSERT_TRUE(hurdle.GetNonUniqueName()== "bob");
|
|
|
| // Try to lookup by the tagname. These should fail.
|
| - Entry tag_alpha(&trans, GET_BY_SERVER_TAG, "alpha");
|
| + Entry tag_alpha(&trans, GET_BY_SERVER_TAG_DEPRECATED, "alpha");
|
| EXPECT_FALSE(tag_alpha.good());
|
| - Entry tag_bob(&trans, GET_BY_SERVER_TAG, "bob");
|
| + Entry tag_bob(&trans, GET_BY_SERVER_TAG_DEPRECATED, "bob");
|
| EXPECT_FALSE(tag_bob.good());
|
| }
|
|
|
| @@ -4160,12 +4161,12 @@ TEST_F(SyncerTest, UniqueServerTagUpdates) {
|
|
|
| // The new items should be applied as new entries, and we should be able
|
| // to look them up by their tag values.
|
| - Entry tag_alpha(&trans, GET_BY_SERVER_TAG, "alpha");
|
| + Entry tag_alpha(&trans, GET_BY_SERVER_TAG_DEPRECATED, "alpha");
|
| ASSERT_TRUE(tag_alpha.good());
|
| ASSERT_TRUE(!tag_alpha.GetIsDel());
|
| ASSERT_TRUE(tag_alpha.GetUniqueServerTag()== "alpha");
|
| ASSERT_TRUE(tag_alpha.GetNonUniqueName()== "update1");
|
| - Entry tag_bob(&trans, GET_BY_SERVER_TAG, "bob");
|
| + Entry tag_bob(&trans, GET_BY_SERVER_TAG_DEPRECATED, "bob");
|
| ASSERT_TRUE(tag_bob.good());
|
| ASSERT_TRUE(!tag_bob.GetIsDel());
|
| ASSERT_TRUE(tag_bob.GetUniqueServerTag()== "bob");
|
|
|