Move UTF16ToASCII, remove WideToASCII.

ui/views/controls/tree/tree_view_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/tree/tree_view.h"
 
 #include <string>
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 72 matching lines @@
   model_.Add(parent, new_node, index);
   return new_node;
 }
 
 std::string TreeViewTest::TreeViewContentsAsString() {
   return InternalNodeAsString(&tree_.root_);
 }
 
 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) {
   return GetNodeByTitleImpl(model_.GetRoot(), ASCIIToUTF16(title));
 }
 
 void TreeViewTest::IncrementSelection(bool next) {
   tree_.IncrementSelection(next ? TreeView::INCREMENT_NEXT :
                            TreeView::INCREMENT_PREVIOUS);
 }
@@ skipping 17 matching lines @@
   for (int i = 0; i < node->child_count(); ++i) {
     TestNode* child = GetNodeByTitleImpl(node->GetChild(i), title);
     if (child)
       return child;
   }
   return NULL;
 }
 
 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) {
       if (i > 0)
         result += " ";
       result += InternalNodeAsString(node->GetChild(i));
     }
     result += "]";
   }
   return result;
@@ skipping 266 matching lines @@
   tree_.SetSelectedNode(GetNodeByTitle("root"));
   ExpandOrSelectChild();
   tree_.SetEditable(true);
   tree_.StartEditing(GetNodeByTitle("a"));
   tree_.editor()->SetText(ASCIIToUTF16("a changed"));
   tree_.OnDidChangeFocus(NULL, NULL);
   EXPECT_TRUE(GetNodeByTitle("a changed") != NULL);
 }
 
 }  // namespace views