| 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) {
|
|
|