summaryrefslogtreecommitdiffstats
path: root/chrome/browser/bookmarks/bookmark_test_helpers.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/bookmarks/bookmark_test_helpers.cc')
-rw-r--r--chrome/browser/bookmarks/bookmark_test_helpers.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/bookmarks/bookmark_test_helpers.cc b/chrome/browser/bookmarks/bookmark_test_helpers.cc
index d2d0b6d..73898d8 100644
--- a/chrome/browser/bookmarks/bookmark_test_helpers.cc
+++ b/chrome/browser/bookmarks/bookmark_test_helpers.cc
@@ -69,14 +69,15 @@ std::string::size_type AddNodesFromString(BookmarkModel* model,
if (tell == folder_tell) {
node_name = node_name.substr(0, part_length - 2);
const BookmarkNode* new_node =
- model->AddFolder(node, index, UTF8ToUTF16(node_name));
+ model->AddFolder(node, index, base::UTF8ToUTF16(node_name));
end_pos = AddNodesFromString(model, new_node, model_string,
end_pos + 1);
} else {
std::string url_string("http://");
url_string += std::string(node_name.begin(), node_name.end());
url_string += ".com";
- model->AddURL(node, index, UTF8ToUTF16(node_name), GURL(url_string));
+ model->AddURL(
+ node, index, base::UTF8ToUTF16(node_name), GURL(url_string));
++end_pos;
}
++index;
@@ -117,10 +118,10 @@ std::string ModelStringFromNode(const BookmarkNode* node) {
for (int i = 0; i < child_count; ++i) {
const BookmarkNode* child = node->GetChild(i);
if (child->is_folder()) {
- child_string += UTF16ToUTF8(child->GetTitle()) + ":[ " +
+ child_string += base::UTF16ToUTF8(child->GetTitle()) + ":[ " +
ModelStringFromNode(child) + "] ";
} else {
- child_string += UTF16ToUTF8(child->GetTitle()) + " ";
+ child_string += base::UTF16ToUTF8(child->GetTitle()) + " ";
}
}
return child_string;