Index: chrome/browser/sync/test/integration/bookmarks_helper.cc |
diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.cc b/chrome/browser/sync/test/integration/bookmarks_helper.cc |
index 49ca45da6d33017200d6f056bb461bed1e52dd93..f53b23da2b8a61df14eacbcec77e9c5f08628527 100644 |
--- a/chrome/browser/sync/test/integration/bookmarks_helper.cc |
+++ b/chrome/browser/sync/test/integration/bookmarks_helper.cc |
@@ -426,7 +426,7 @@ const BookmarkNode* AddURL(int profile, |
return NULL; |
} |
const BookmarkNode* result = GetBookmarkModel(profile)-> |
- AddURL(parent, index, WideToUTF16(title), url); |
+ AddURL(parent, index, base::WideToUTF16(title), url); |
if (!result) { |
LOG(ERROR) << "Could not add bookmark " << title << " to Profile " |
<< profile; |
@@ -436,7 +436,7 @@ const BookmarkNode* AddURL(int profile, |
const BookmarkNode* v_parent = NULL; |
FindNodeInVerifier(GetBookmarkModel(profile), parent, &v_parent); |
const BookmarkNode* v_node = GetVerifierBookmarkModel()-> |
- AddURL(v_parent, index, WideToUTF16(title), url); |
+ AddURL(v_parent, index, base::WideToUTF16(title), url); |
if (!v_node) { |
LOG(ERROR) << "Could not add bookmark " << title << " to the verifier"; |
return NULL; |
@@ -467,7 +467,8 @@ const BookmarkNode* AddFolder(int profile, |
return NULL; |
} |
const BookmarkNode* result = |
- GetBookmarkModel(profile)->AddFolder(parent, index, WideToUTF16(title)); |
+ GetBookmarkModel(profile)->AddFolder(parent, index, |
+ base::WideToUTF16(title)); |
EXPECT_TRUE(result); |
if (!result) { |
LOG(ERROR) << "Could not add folder " << title << " to Profile " |
@@ -478,7 +479,7 @@ const BookmarkNode* AddFolder(int profile, |
const BookmarkNode* v_parent = NULL; |
FindNodeInVerifier(GetBookmarkModel(profile), parent, &v_parent); |
const BookmarkNode* v_node = GetVerifierBookmarkModel()->AddFolder( |
- v_parent, index, WideToUTF16(title)); |
+ v_parent, index, base::WideToUTF16(title)); |
if (!v_node) { |
LOG(ERROR) << "Could not add folder " << title << " to the verifier"; |
return NULL; |
@@ -497,9 +498,9 @@ void SetTitle(int profile, |
if (test()->use_verifier()) { |
const BookmarkNode* v_node = NULL; |
FindNodeInVerifier(GetBookmarkModel(profile), node, &v_node); |
- GetVerifierBookmarkModel()->SetTitle(v_node, WideToUTF16(new_title)); |
+ GetVerifierBookmarkModel()->SetTitle(v_node, base::WideToUTF16(new_title)); |
} |
- GetBookmarkModel(profile)->SetTitle(node, WideToUTF16(new_title)); |
+ GetBookmarkModel(profile)->SetTitle(node, base::WideToUTF16(new_title)); |
} |
void SetFavicon(int profile, |
@@ -691,13 +692,13 @@ const BookmarkNode* GetUniqueNodeByURL(int profile, const GURL& url) { |
int CountBookmarksWithTitlesMatching(int profile, const std::wstring& title) { |
return CountNodesWithTitlesMatching(GetBookmarkModel(profile), |
BookmarkNode::URL, |
- WideToUTF16(title)); |
+ base::WideToUTF16(title)); |
} |
int CountFoldersWithTitlesMatching(int profile, const std::wstring& title) { |
return CountNodesWithTitlesMatching(GetBookmarkModel(profile), |
BookmarkNode::FOLDER, |
- WideToUTF16(title)); |
+ base::WideToUTF16(title)); |
} |
gfx::Image CreateFavicon(SkColor color) { |