| Index: sync/api/sync_change_unittest.cc
|
| diff --git a/sync/api/sync_change_unittest.cc b/sync/api/sync_change_unittest.cc
|
| index 3faa58773c78e2502df862a72a50aea6518132a9..765bcdf431d8257c84929ff34c2ff0d640d0907c 100644
|
| --- a/sync/api/sync_change_unittest.cc
|
| +++ b/sync/api/sync_change_unittest.cc
|
| @@ -26,10 +26,10 @@ TEST_F(SyncChangeTest, LocalDelete) {
|
| SyncChange::SyncChangeType change_type = SyncChange::ACTION_DELETE;
|
| std::string tag = "client_tag";
|
| SyncChange e(change_type,
|
| - SyncData::CreateLocalDelete(tag, syncable::PREFERENCES));
|
| + SyncData::CreateLocalDelete(tag, syncer::PREFERENCES));
|
| EXPECT_EQ(change_type, e.change_type());
|
| EXPECT_EQ(tag, e.sync_data().GetTag());
|
| - EXPECT_EQ(syncable::PREFERENCES, e.sync_data().GetDataType());
|
| + EXPECT_EQ(syncer::PREFERENCES, e.sync_data().GetDataType());
|
| }
|
|
|
| TEST_F(SyncChangeTest, LocalUpdate) {
|
| @@ -44,7 +44,7 @@ TEST_F(SyncChangeTest, LocalUpdate) {
|
| EXPECT_EQ(change_type, e.change_type());
|
| EXPECT_EQ(tag, e.sync_data().GetTag());
|
| EXPECT_EQ(title, e.sync_data().GetTitle());
|
| - EXPECT_EQ(syncable::PREFERENCES, e.sync_data().GetDataType());
|
| + EXPECT_EQ(syncer::PREFERENCES, e.sync_data().GetDataType());
|
| scoped_ptr<DictionaryValue> ref_spec(EntitySpecificsToValue(specifics));
|
| scoped_ptr<DictionaryValue> e_spec(EntitySpecificsToValue(
|
| e.sync_data().GetSpecifics()));
|
| @@ -63,7 +63,7 @@ TEST_F(SyncChangeTest, LocalAdd) {
|
| EXPECT_EQ(change_type, e.change_type());
|
| EXPECT_EQ(tag, e.sync_data().GetTag());
|
| EXPECT_EQ(title, e.sync_data().GetTitle());
|
| - EXPECT_EQ(syncable::PREFERENCES, e.sync_data().GetDataType());
|
| + EXPECT_EQ(syncer::PREFERENCES, e.sync_data().GetDataType());
|
| scoped_ptr<DictionaryValue> ref_spec(EntitySpecificsToValue(specifics));
|
| scoped_ptr<DictionaryValue> e_spec(EntitySpecificsToValue(
|
| e.sync_data().GetSpecifics()));
|
| @@ -103,7 +103,7 @@ TEST_F(SyncChangeTest, SyncerChanges) {
|
| // Verify update.
|
| SyncChange e = change_list[0];
|
| EXPECT_EQ(SyncChange::ACTION_UPDATE, e.change_type());
|
| - EXPECT_EQ(syncable::PREFERENCES, e.sync_data().GetDataType());
|
| + EXPECT_EQ(syncer::PREFERENCES, e.sync_data().GetDataType());
|
| scoped_ptr<DictionaryValue> ref_spec(EntitySpecificsToValue(
|
| update_specifics));
|
| scoped_ptr<DictionaryValue> e_spec(EntitySpecificsToValue(
|
| @@ -113,7 +113,7 @@ TEST_F(SyncChangeTest, SyncerChanges) {
|
| // Verify add.
|
| e = change_list[1];
|
| EXPECT_EQ(SyncChange::ACTION_ADD, e.change_type());
|
| - EXPECT_EQ(syncable::PREFERENCES, e.sync_data().GetDataType());
|
| + EXPECT_EQ(syncer::PREFERENCES, e.sync_data().GetDataType());
|
| ref_spec.reset(EntitySpecificsToValue(add_specifics));
|
| e_spec.reset(EntitySpecificsToValue(e.sync_data().GetSpecifics()));
|
| EXPECT_TRUE(ref_spec->Equals(e_spec.get()));
|
| @@ -121,7 +121,7 @@ TEST_F(SyncChangeTest, SyncerChanges) {
|
| // Verify delete.
|
| e = change_list[2];
|
| EXPECT_EQ(SyncChange::ACTION_DELETE, e.change_type());
|
| - EXPECT_EQ(syncable::PREFERENCES, e.sync_data().GetDataType());
|
| + EXPECT_EQ(syncer::PREFERENCES, e.sync_data().GetDataType());
|
| ref_spec.reset(EntitySpecificsToValue(delete_specifics));
|
| e_spec.reset(EntitySpecificsToValue(e.sync_data().GetSpecifics()));
|
| EXPECT_TRUE(ref_spec->Equals(e_spec.get()));
|
|
|