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

Unified Diff: ui/views/controls/tree/tree_view_unittest.cc

Issue 176843022: Move UTF16ToASCII, remove WideToASCII. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months 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 | « ui/base/l10n/l10n_util_win.cc ('k') | ui/views/examples/table_example.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/tree/tree_view_unittest.cc
diff --git a/ui/views/controls/tree/tree_view_unittest.cc b/ui/views/controls/tree/tree_view_unittest.cc
index fd77026d1284389d5df5a1f5c65938ef9b0efb8e..bf73da99ec12df1afbc1a95ca971a16d67e340c6 100644
--- a/ui/views/controls/tree/tree_view_unittest.cc
+++ b/ui/views/controls/tree/tree_view_unittest.cc
@@ -90,12 +90,14 @@ std::string TreeViewTest::TreeViewContentsAsString() {
std::string TreeViewTest::GetSelectedNodeTitle() {
TreeModelNode* model_node = tree_.GetSelectedNode();
- return model_node ? UTF16ToASCII(model_node->GetTitle()) : std::string();
+ return model_node ? base::UTF16ToASCII(model_node->GetTitle())
+ : std::string();
}
std::string TreeViewTest::GetEditingNodeTitle() {
TreeModelNode* model_node = tree_.GetEditingNode();
- return model_node ? UTF16ToASCII(model_node->GetTitle()) : std::string();
+ return model_node ? base::UTF16ToASCII(model_node->GetTitle())
+ : std::string();
}
TestNode* TreeViewTest::GetNodeByTitle(const std::string& title) {
@@ -133,7 +135,7 @@ TestNode* TreeViewTest::GetNodeByTitleImpl(TestNode* node,
std::string TreeViewTest::InternalNodeAsString(
TreeView::InternalNode* node) {
- std::string result = UTF16ToASCII(node->model_node()->GetTitle());
+ std::string result = base::UTF16ToASCII(node->model_node()->GetTitle());
if (node->is_expanded() && node->child_count()) {
result += " [";
for (int i = 0; i < node->child_count(); ++i) {
« no previous file with comments | « ui/base/l10n/l10n_util_win.cc ('k') | ui/views/examples/table_example.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698