diff options
Diffstat (limited to 'chrome/browser/search_engines/template_url_service_sync_unittest.cc')
-rw-r--r-- | chrome/browser/search_engines/template_url_service_sync_unittest.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/search_engines/template_url_service_sync_unittest.cc b/chrome/browser/search_engines/template_url_service_sync_unittest.cc index 64d0835..9509ecf 100644 --- a/chrome/browser/search_engines/template_url_service_sync_unittest.cc +++ b/chrome/browser/search_engines/template_url_service_sync_unittest.cc @@ -28,6 +28,7 @@ #include "sync/protocol/sync.pb.h" #include "testing/gtest/include/gtest/gtest.h" +using base::ASCIIToUTF16; using base::Time; namespace { @@ -58,9 +59,9 @@ syncer::SyncData CreateCustomSyncData(const TemplateURL& turl, sync_pb::EntitySpecifics specifics; sync_pb::SearchEngineSpecifics* se_specifics = specifics.mutable_search_engine(); - se_specifics->set_short_name(UTF16ToUTF8(turl.short_name())); + se_specifics->set_short_name(base::UTF16ToUTF8(turl.short_name())); se_specifics->set_keyword( - autogenerate_keyword ? std::string() : UTF16ToUTF8(turl.keyword())); + autogenerate_keyword ? std::string() : base::UTF16ToUTF8(turl.keyword())); se_specifics->set_favicon_url(turl.favicon_url().spec()); se_specifics->set_url(url); se_specifics->set_safe_for_autoreplace(turl.safe_for_autoreplace()); @@ -1261,12 +1262,12 @@ TEST_F(TemplateURLServiceSyncTest, TwoAutogeneratedKeywordsUsingGoogleBaseURL) { syncer::SyncChange key1_change = processor()->change_for_guid("key1"); EXPECT_EQ(syncer::SyncChange::ACTION_UPDATE, key1_change.change_type()); EXPECT_EQ(keyword1->keyword(), - UTF8ToUTF16(GetKeyword(key1_change.sync_data()))); + base::UTF8ToUTF16(GetKeyword(key1_change.sync_data()))); ASSERT_TRUE(processor()->contains_guid("key2")); syncer::SyncChange key2_change = processor()->change_for_guid("key2"); EXPECT_EQ(syncer::SyncChange::ACTION_UPDATE, key2_change.change_type()); EXPECT_EQ(keyword2->keyword(), - UTF8ToUTF16(GetKeyword(key2_change.sync_data()))); + base::UTF8ToUTF16(GetKeyword(key2_change.sync_data()))); } TEST_F(TemplateURLServiceSyncTest, DuplicateEncodingsRemoved) { |