Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(37)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/internal_api/sync_manager_impl_unittest.cc

Issue 121123002: Update uses of UTF conversions in ppapi/, printing/, remoting/, rlz/, sandbox/, skia/, sql/, sync/,… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sql/statement.cc ('k') | sync/internal_api/write_node.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/sync_manager_impl_unittest.cc
diff --git a/sync/internal_api/sync_manager_impl_unittest.cc b/sync/internal_api/sync_manager_impl_unittest.cc
index 91be3b80dfd588ceec1e24f4abca7f9398b6c482..c8d5817620eb50ea921511c5e66d2c3065e4b9e5 100644
--- a/sync/internal_api/sync_manager_impl_unittest.cc
+++ b/sync/internal_api/sync_manager_impl_unittest.cc
@@ -353,7 +353,7 @@ TEST_F(SyncApiTest, TestDeleteBehavior) {
wnode.InitUniqueByCreation(BOOKMARKS, root_node, "testtag");
EXPECT_EQ(WriteNode::INIT_SUCCESS, result);
wnode.SetIsFolder(false);
- wnode.SetTitle(UTF8ToWide(test_title));
+ wnode.SetTitle(base::UTF8ToWide(test_title));
node_id = wnode.GetId();
}
@@ -398,7 +398,7 @@ TEST_F(SyncApiTest, TestDeleteBehavior) {
EXPECT_EQ(wnode.GetParentId(), folder_node.GetId());
EXPECT_EQ(wnode.GetId(), node_id);
EXPECT_NE(wnode.GetTitle(), test_title); // Title should be cleared
- wnode.SetTitle(UTF8ToWide(test_title));
+ wnode.SetTitle(base::UTF8ToWide(test_title));
}
// Now look up should work.
@@ -463,13 +463,13 @@ TEST_F(SyncApiTest, WriteEncryptedTitle) {
WriteNode bookmark_node(&trans);
ASSERT_TRUE(bookmark_node.InitBookmarkByCreation(root_node, NULL));
bookmark_id = bookmark_node.GetId();
- bookmark_node.SetTitle(UTF8ToWide("foo"));
+ bookmark_node.SetTitle(base::UTF8ToWide("foo"));
WriteNode pref_node(&trans);
WriteNode::InitUniqueByCreationResult result =
pref_node.InitUniqueByCreation(PREFERENCES, root_node, "bar");
ASSERT_EQ(WriteNode::INIT_SUCCESS, result);
- pref_node.SetTitle(UTF8ToWide("bar"));
+ pref_node.SetTitle(base::UTF8ToWide("bar"));
}
{
ReadTransaction trans(FROM_HERE, test_user_share_.user_share());
@@ -2123,7 +2123,7 @@ TEST_F(SyncManagerTest, CreateLocalBookmark) {
WriteNode node(&trans);
ASSERT_TRUE(node.InitBookmarkByCreation(bookmark_root, NULL));
node.SetIsFolder(false);
- node.SetTitle(UTF8ToWide(title));
+ node.SetTitle(base::UTF8ToWide(title));
sync_pb::BookmarkSpecifics bookmark_specifics(node.GetBookmarkSpecifics());
bookmark_specifics.set_url(url);
@@ -2462,7 +2462,7 @@ TEST_F(SyncManagerTest, SetBookmarkTitle) {
WriteNode node(&trans);
EXPECT_EQ(BaseNode::INIT_OK,
node.InitByClientTagLookup(BOOKMARKS, client_tag));
- node.SetTitle(UTF8ToWide(client_tag));
+ node.SetTitle(base::UTF8ToWide(client_tag));
}
EXPECT_FALSE(ResetUnsyncedEntry(BOOKMARKS, client_tag));
@@ -2472,7 +2472,7 @@ TEST_F(SyncManagerTest, SetBookmarkTitle) {
WriteNode node(&trans);
EXPECT_EQ(BaseNode::INIT_OK,
node.InitByClientTagLookup(BOOKMARKS, client_tag));
- node.SetTitle(UTF8ToWide("title2"));
+ node.SetTitle(base::UTF8ToWide("title2"));
}
EXPECT_TRUE(ResetUnsyncedEntry(BOOKMARKS, client_tag));
}
@@ -2511,7 +2511,7 @@ TEST_F(SyncManagerTest, SetBookmarkTitleWithEncryption) {
WriteNode node(&trans);
EXPECT_EQ(BaseNode::INIT_OK,
node.InitByClientTagLookup(BOOKMARKS, client_tag));
- node.SetTitle(UTF8ToWide(client_tag));
+ node.SetTitle(base::UTF8ToWide(client_tag));
const syncable::Entry* node_entry = node.GetEntry();
const sync_pb::EntitySpecifics& specifics = node_entry->GetSpecifics();
EXPECT_TRUE(specifics.has_encrypted());
@@ -2526,7 +2526,7 @@ TEST_F(SyncManagerTest, SetBookmarkTitleWithEncryption) {
WriteNode node(&trans);
EXPECT_EQ(BaseNode::INIT_OK,
node.InitByClientTagLookup(BOOKMARKS, client_tag));
- node.SetTitle(UTF8ToWide("title2"));
+ node.SetTitle(base::UTF8ToWide("title2"));
const syncable::Entry* node_entry = node.GetEntry();
const sync_pb::EntitySpecifics& specifics = node_entry->GetSpecifics();
EXPECT_TRUE(specifics.has_encrypted());
@@ -2557,7 +2557,7 @@ TEST_F(SyncManagerTest, SetNonBookmarkTitle) {
WriteNode node(&trans);
EXPECT_EQ(BaseNode::INIT_OK,
node.InitByClientTagLookup(PREFERENCES, client_tag));
- node.SetTitle(UTF8ToWide(client_tag));
+ node.SetTitle(base::UTF8ToWide(client_tag));
}
EXPECT_FALSE(ResetUnsyncedEntry(PREFERENCES, client_tag));
@@ -2567,7 +2567,7 @@ TEST_F(SyncManagerTest, SetNonBookmarkTitle) {
WriteNode node(&trans);
EXPECT_EQ(BaseNode::INIT_OK,
node.InitByClientTagLookup(PREFERENCES, client_tag));
- node.SetTitle(UTF8ToWide("title2"));
+ node.SetTitle(base::UTF8ToWide("title2"));
}
EXPECT_TRUE(ResetUnsyncedEntry(PREFERENCES, client_tag));
}
@@ -2608,7 +2608,7 @@ TEST_F(SyncManagerTest, SetNonBookmarkTitleWithEncryption) {
WriteNode node(&trans);
EXPECT_EQ(BaseNode::INIT_OK,
node.InitByClientTagLookup(PREFERENCES, client_tag));
- node.SetTitle(UTF8ToWide(client_tag));
+ node.SetTitle(base::UTF8ToWide(client_tag));
const syncable::Entry* node_entry = node.GetEntry();
const sync_pb::EntitySpecifics& specifics = node_entry->GetSpecifics();
EXPECT_TRUE(specifics.has_encrypted());
@@ -2623,7 +2623,7 @@ TEST_F(SyncManagerTest, SetNonBookmarkTitleWithEncryption) {
WriteNode node(&trans);
EXPECT_EQ(BaseNode::INIT_OK,
node.InitByClientTagLookup(PREFERENCES, client_tag));
- node.SetTitle(UTF8ToWide("title2"));
+ node.SetTitle(base::UTF8ToWide("title2"));
const syncable::Entry* node_entry = node.GetEntry();
const sync_pb::EntitySpecifics& specifics = node_entry->GetSpecifics();
EXPECT_TRUE(specifics.has_encrypted());
@@ -2656,7 +2656,7 @@ TEST_F(SyncManagerTest, SetLongTitle) {
WriteNode node(&trans);
EXPECT_EQ(BaseNode::INIT_OK,
node.InitByClientTagLookup(PREFERENCES, kClientTag));
- node.SetTitle(UTF8ToWide(title));
+ node.SetTitle(base::UTF8ToWide(title));
EXPECT_EQ(node.GetTitle(), title.substr(0, 255));
}
EXPECT_TRUE(ResetUnsyncedEntry(PREFERENCES, kClientTag));
@@ -2667,7 +2667,7 @@ TEST_F(SyncManagerTest, SetLongTitle) {
WriteNode node(&trans);
EXPECT_EQ(BaseNode::INIT_OK,
node.InitByClientTagLookup(PREFERENCES, kClientTag));
- node.SetTitle(UTF8ToWide(title));
+ node.SetTitle(base::UTF8ToWide(title));
EXPECT_EQ(node.GetTitle(), title.substr(0, 255));
}
EXPECT_FALSE(ResetUnsyncedEntry(PREFERENCES, kClientTag));
@@ -2678,7 +2678,7 @@ TEST_F(SyncManagerTest, SetLongTitle) {
WriteNode node(&trans);
EXPECT_EQ(BaseNode::INIT_OK,
node.InitByClientTagLookup(PREFERENCES, kClientTag));
- node.SetTitle(UTF8ToWide("title2"));
+ node.SetTitle(base::UTF8ToWide("title2"));
}
EXPECT_TRUE(ResetUnsyncedEntry(PREFERENCES, kClientTag));
}
« no previous file with comments | « sql/statement.cc ('k') | sync/internal_api/write_node.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698