| Index: sync/engine/verify_updates_command_unittest.cc
|
| diff --git a/sync/engine/verify_updates_command_unittest.cc b/sync/engine/verify_updates_command_unittest.cc
|
| index afbc78413df542b127c7738aacdd269290d09f49..8bf9ead7da00db25adc46acd64ec96d7e4eb4553 100644
|
| --- a/sync/engine/verify_updates_command_unittest.cc
|
| +++ b/sync/engine/verify_updates_command_unittest.cc
|
| @@ -29,15 +29,15 @@ class VerifyUpdatesCommandTest : public SyncerCommandTest {
|
| mutable_routing_info()->clear();
|
| workers()->push_back(make_scoped_refptr(new FakeModelWorker(GROUP_DB)));
|
| workers()->push_back(make_scoped_refptr(new FakeModelWorker(GROUP_UI)));
|
| - (*mutable_routing_info())[syncable::PREFERENCES] = GROUP_UI;
|
| - (*mutable_routing_info())[syncable::BOOKMARKS] = GROUP_UI;
|
| - (*mutable_routing_info())[syncable::AUTOFILL] = GROUP_DB;
|
| + (*mutable_routing_info())[syncer::PREFERENCES] = GROUP_UI;
|
| + (*mutable_routing_info())[syncer::BOOKMARKS] = GROUP_UI;
|
| + (*mutable_routing_info())[syncer::AUTOFILL] = GROUP_DB;
|
| SyncerCommandTest::SetUp();
|
| }
|
|
|
| void CreateLocalItem(const std::string& item_id,
|
| const std::string& parent_id,
|
| - const syncable::ModelType& type) {
|
| + const syncer::ModelType& type) {
|
| WriteTransaction trans(FROM_HERE, UNITTEST, directory());
|
| MutableEntry entry(&trans, syncable::CREATE_NEW_UPDATE_ITEM,
|
| Id::CreateFromServerId(item_id));
|
| @@ -54,7 +54,7 @@ class VerifyUpdatesCommandTest : public SyncerCommandTest {
|
|
|
| void AddUpdate(GetUpdatesResponse* updates,
|
| const std::string& id, const std::string& parent,
|
| - const syncable::ModelType& type) {
|
| + const syncer::ModelType& type) {
|
| sync_pb::SyncEntity* e = updates->add_entries();
|
| e->set_id_string("b1");
|
| e->set_parent_id_string(parent);
|
| @@ -70,19 +70,19 @@ class VerifyUpdatesCommandTest : public SyncerCommandTest {
|
| TEST_F(VerifyUpdatesCommandTest, AllVerified) {
|
| string root = syncable::GetNullId().GetServerId();
|
|
|
| - CreateLocalItem("b1", root, syncable::BOOKMARKS);
|
| - CreateLocalItem("b2", root, syncable::BOOKMARKS);
|
| - CreateLocalItem("p1", root, syncable::PREFERENCES);
|
| - CreateLocalItem("a1", root, syncable::AUTOFILL);
|
| + CreateLocalItem("b1", root, syncer::BOOKMARKS);
|
| + CreateLocalItem("b2", root, syncer::BOOKMARKS);
|
| + CreateLocalItem("p1", root, syncer::PREFERENCES);
|
| + CreateLocalItem("a1", root, syncer::AUTOFILL);
|
|
|
| ExpectNoGroupsToChange(command_);
|
|
|
| GetUpdatesResponse* updates = session()->mutable_status_controller()->
|
| mutable_updates_response()->mutable_get_updates();
|
| - AddUpdate(updates, "b1", root, syncable::BOOKMARKS);
|
| - AddUpdate(updates, "b2", root, syncable::BOOKMARKS);
|
| - AddUpdate(updates, "p1", root, syncable::PREFERENCES);
|
| - AddUpdate(updates, "a1", root, syncable::AUTOFILL);
|
| + AddUpdate(updates, "b1", root, syncer::BOOKMARKS);
|
| + AddUpdate(updates, "b2", root, syncer::BOOKMARKS);
|
| + AddUpdate(updates, "p1", root, syncer::PREFERENCES);
|
| + AddUpdate(updates, "a1", root, syncer::AUTOFILL);
|
|
|
| ExpectGroupsToChange(command_, GROUP_UI, GROUP_DB);
|
|
|
|
|