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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc

Issue 109013006: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix 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 | « chrome/browser/accessibility/accessibility_extension_apitest.cc ('k') | chrome/browser/android/dev_tools_server.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc
diff --git a/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc b/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc
index e40c0d47e24af3cda63dc3e563484501b07cc8d3..dbbf1cedd5ca3d00e7a6fe4919226b00049bf07d 100644
--- a/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc
+++ b/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc
@@ -149,7 +149,7 @@ TEST_F(PartnerBookmarksShimTest, RemoveBookmarks) {
EXPECT_CALL(observer_, PartnerShimChanged(shim)).Times(0);
BookmarkNode* root_partner_node = new BookmarkPermanentNode(0);
- root_partner_node->SetTitle(ASCIIToUTF16("Partner bookmarks"));
+ root_partner_node->SetTitle(base::ASCIIToUTF16("Partner bookmarks"));
BookmarkNode* partner_folder1 = new BookmarkNode(1, GURL("http://www.a.net"));
partner_folder1->set_type(BookmarkNode::FOLDER);
@@ -238,28 +238,28 @@ TEST_F(PartnerBookmarksShimTest, RenameBookmarks) {
EXPECT_CALL(observer_, PartnerShimChanged(shim)).Times(0);
BookmarkNode* root_partner_node = new BookmarkPermanentNode(0);
- root_partner_node->SetTitle(ASCIIToUTF16("Partner bookmarks"));
+ root_partner_node->SetTitle(base::ASCIIToUTF16("Partner bookmarks"));
BookmarkNode* partner_folder1 = new BookmarkNode(1, GURL("http://www.a.net"));
partner_folder1->set_type(BookmarkNode::FOLDER);
- partner_folder1->SetTitle(ASCIIToUTF16("a.net"));
+ partner_folder1->SetTitle(base::ASCIIToUTF16("a.net"));
root_partner_node->Add(partner_folder1, root_partner_node->child_count());
BookmarkNode* partner_folder2 = new BookmarkNode(2, GURL("http://www.b.net"));
partner_folder2->set_type(BookmarkNode::FOLDER);
- partner_folder2->SetTitle(ASCIIToUTF16("b.net"));
+ partner_folder2->SetTitle(base::ASCIIToUTF16("b.net"));
root_partner_node->Add(partner_folder2, root_partner_node->child_count());
BookmarkNode* partner_bookmark1 = new BookmarkNode(3,
GURL("http://www.a.com"));
partner_bookmark1->set_type(BookmarkNode::URL);
- partner_bookmark1->SetTitle(ASCIIToUTF16("a.com"));
+ partner_bookmark1->SetTitle(base::ASCIIToUTF16("a.com"));
partner_folder1->Add(partner_bookmark1, partner_folder1->child_count());
BookmarkNode* partner_bookmark2 = new BookmarkNode(4,
GURL("http://www.b.com"));
partner_bookmark2->set_type(BookmarkNode::URL);
- partner_bookmark2->SetTitle(ASCIIToUTF16("b.com"));
+ partner_bookmark2->SetTitle(base::ASCIIToUTF16("b.com"));
partner_folder2->Add(partner_bookmark2, partner_folder2->child_count());
ASSERT_FALSE(shim->IsLoaded());
@@ -280,9 +280,9 @@ TEST_F(PartnerBookmarksShimTest, RenameBookmarks) {
EXPECT_TRUE(shim->IsReachable(partner_bookmark2));
EXPECT_CALL(observer_, PartnerShimChanged(shim)).Times(1);
- EXPECT_EQ(ASCIIToUTF16("b.com"), shim->GetTitle(partner_bookmark2));
- shim->RenameBookmark(partner_bookmark2, ASCIIToUTF16("b2.com"));
- EXPECT_EQ(ASCIIToUTF16("b2.com"), shim->GetTitle(partner_bookmark2));
+ EXPECT_EQ(base::ASCIIToUTF16("b.com"), shim->GetTitle(partner_bookmark2));
+ shim->RenameBookmark(partner_bookmark2, base::ASCIIToUTF16("b2.com"));
+ EXPECT_EQ(base::ASCIIToUTF16("b2.com"), shim->GetTitle(partner_bookmark2));
EXPECT_TRUE(shim->IsReachable(root_partner_node));
EXPECT_TRUE(shim->IsReachable(partner_folder1));
@@ -291,9 +291,9 @@ TEST_F(PartnerBookmarksShimTest, RenameBookmarks) {
EXPECT_TRUE(shim->IsReachable(partner_bookmark2));
EXPECT_CALL(observer_, PartnerShimChanged(shim)).Times(1);
- EXPECT_EQ(ASCIIToUTF16("a.net"), shim->GetTitle(partner_folder1));
- shim->RenameBookmark(partner_folder1, ASCIIToUTF16("a2.net"));
- EXPECT_EQ(ASCIIToUTF16("a2.net"), shim->GetTitle(partner_folder1));
+ EXPECT_EQ(base::ASCIIToUTF16("a.net"), shim->GetTitle(partner_folder1));
+ shim->RenameBookmark(partner_folder1, base::ASCIIToUTF16("a2.net"));
+ EXPECT_EQ(base::ASCIIToUTF16("a2.net"), shim->GetTitle(partner_folder1));
EXPECT_TRUE(shim->IsReachable(root_partner_node));
EXPECT_TRUE(shim->IsReachable(partner_folder1));
@@ -302,10 +302,10 @@ TEST_F(PartnerBookmarksShimTest, RenameBookmarks) {
EXPECT_TRUE(shim->IsReachable(partner_bookmark2));
EXPECT_CALL(observer_, PartnerShimChanged(shim)).Times(1);
- EXPECT_EQ(ASCIIToUTF16("Partner bookmarks"),
+ EXPECT_EQ(base::ASCIIToUTF16("Partner bookmarks"),
shim->GetTitle(root_partner_node));
- shim->RenameBookmark(root_partner_node, ASCIIToUTF16("Partner"));
- EXPECT_EQ(ASCIIToUTF16("Partner"), shim->GetTitle(root_partner_node));
+ shim->RenameBookmark(root_partner_node, base::ASCIIToUTF16("Partner"));
+ EXPECT_EQ(base::ASCIIToUTF16("Partner"), shim->GetTitle(root_partner_node));
EXPECT_TRUE(shim->IsReachable(root_partner_node));
EXPECT_TRUE(shim->IsReachable(partner_folder1));
@@ -323,23 +323,23 @@ TEST_F(PartnerBookmarksShimTest, SaveLoadProfile) {
EXPECT_CALL(observer_, PartnerShimChanged(shim)).Times(0);
BookmarkNode* root_partner_node = new BookmarkPermanentNode(0);
- root_partner_node->SetTitle(ASCIIToUTF16("Partner bookmarks"));
+ root_partner_node->SetTitle(base::ASCIIToUTF16("Partner bookmarks"));
BookmarkNode* partner_folder1 = new BookmarkNode(1, GURL("http://a.net"));
partner_folder1->set_type(BookmarkNode::FOLDER);
- partner_folder1->SetTitle(ASCIIToUTF16("a.net"));
+ partner_folder1->SetTitle(base::ASCIIToUTF16("a.net"));
root_partner_node->Add(partner_folder1, root_partner_node->child_count());
BookmarkNode* partner_bookmark1 = new BookmarkNode(3,
GURL("http://a.com"));
partner_bookmark1->set_type(BookmarkNode::URL);
- partner_bookmark1->SetTitle(ASCIIToUTF16("a.com"));
+ partner_bookmark1->SetTitle(base::ASCIIToUTF16("a.com"));
partner_folder1->Add(partner_bookmark1, partner_folder1->child_count());
BookmarkNode* partner_bookmark2 = new BookmarkNode(5,
GURL("http://b.com"));
partner_bookmark2->set_type(BookmarkNode::URL);
- partner_bookmark2->SetTitle(ASCIIToUTF16("b.com"));
+ partner_bookmark2->SetTitle(base::ASCIIToUTF16("b.com"));
partner_folder1->Add(partner_bookmark2, partner_folder1->child_count());
ASSERT_FALSE(shim->IsLoaded());
@@ -348,9 +348,9 @@ TEST_F(PartnerBookmarksShimTest, SaveLoadProfile) {
ASSERT_TRUE(shim->IsLoaded());
EXPECT_CALL(observer_, PartnerShimChanged(shim)).Times(2);
- shim->RenameBookmark(partner_bookmark1, ASCIIToUTF16("a2.com"));
+ shim->RenameBookmark(partner_bookmark1, base::ASCIIToUTF16("a2.com"));
shim->RemoveBookmark(partner_bookmark2);
- EXPECT_EQ(ASCIIToUTF16("a2.com"), shim->GetTitle(partner_bookmark1));
+ EXPECT_EQ(base::ASCIIToUTF16("a2.com"), shim->GetTitle(partner_bookmark1));
EXPECT_FALSE(shim->IsReachable(partner_bookmark2));
}
@@ -367,7 +367,7 @@ TEST_F(PartnerBookmarksShimTest, SaveLoadProfile) {
const BookmarkNode* partner_bookmark1 = shim->GetNodeByID(3);
const BookmarkNode* partner_bookmark2 = shim->GetNodeByID(5);
- EXPECT_EQ(ASCIIToUTF16("a2.com"), shim->GetTitle(partner_bookmark1));
+ EXPECT_EQ(base::ASCIIToUTF16("a2.com"), shim->GetTitle(partner_bookmark1));
EXPECT_FALSE(shim->IsReachable(partner_bookmark2));
}
}
« no previous file with comments | « chrome/browser/accessibility/accessibility_extension_apitest.cc ('k') | chrome/browser/android/dev_tools_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698