Move UTF16ToASCII, remove WideToASCII.

chrome/browser/bookmarks/bookmark_model_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 "chrome/browser/bookmarks/bookmark_model.h"
 
 #include <set>
 #include <string>
 
 #include "base/base_paths.h"
@@ skipping 841 matching lines @@
                           BookmarkModel* model,
                           const BookmarkNode* bb_node) {
   for (int i = 0; i < parent->child_count(); ++i) {
     TestNode* child = parent->GetChild(i);
     if (child->value == BookmarkNode::FOLDER) {
       const BookmarkNode* new_bb_node =
           model->AddFolder(bb_node, i, child->GetTitle());
       PopulateBookmarkNode(child, model, new_bb_node);
     } else {
       model->AddURL(bb_node, i, child->GetTitle(),
-          GURL("http://" + UTF16ToASCII(child->GetTitle())));
+          GURL("http://" + base::UTF16ToASCII(child->GetTitle())));
     }
   }
 }
 
 // Test class that creates a BookmarkModel with a real history backend.
 class BookmarkModelTestWithProfile : public testing::Test {
  public:
   BookmarkModelTestWithProfile()
       : bb_model_(NULL) {}
 
@@ skipping 142 matching lines @@
   new_order.push_back(parent->GetChild(2));
   new_order.push_back(parent->GetChild(1));
   new_order.push_back(parent->GetChild(0));
   model_.ReorderChildren(parent, new_order);
 
   // Make sure we were notified.
   AssertObserverCount(0, 0, 0, 0, 1, 0, 0, 1, 0);
 
   // Make sure the order matches is correct (it should be reversed).
   ASSERT_EQ(4, parent->child_count());
-  EXPECT_EQ("D", UTF16ToASCII(parent->GetChild(0)->GetTitle()));
-  EXPECT_EQ("C", UTF16ToASCII(parent->GetChild(1)->GetTitle()));
-  EXPECT_EQ("B", UTF16ToASCII(parent->GetChild(2)->GetTitle()));
-  EXPECT_EQ("A", UTF16ToASCII(parent->GetChild(3)->GetTitle()));
+  EXPECT_EQ("D", base::UTF16ToASCII(parent->GetChild(0)->GetTitle()));
+  EXPECT_EQ("C", base::UTF16ToASCII(parent->GetChild(1)->GetTitle()));
+  EXPECT_EQ("B", base::UTF16ToASCII(parent->GetChild(2)->GetTitle()));
+  EXPECT_EQ("A", base::UTF16ToASCII(parent->GetChild(3)->GetTitle()));
 }
 
 TEST_F(BookmarkModelTest, NodeVisibility) {
   EXPECT_TRUE(model_.bookmark_bar_node()->IsVisible());
   EXPECT_TRUE(model_.other_node()->IsVisible());
   // Mobile node invisible by default
   EXPECT_FALSE(model_.mobile_node()->IsVisible());
 
   // Change visibility of permanent nodes.
   model_.SetPermanentNodeVisible(BookmarkNode::BOOKMARK_BAR, false);
@@ skipping 77 matching lines @@
   EXPECT_TRUE(node.DeleteMetaInfo("key2.subkey2.leaf"));
   EXPECT_FALSE(node.DeleteMetaInfo("key3"));
   EXPECT_FALSE(node.GetMetaInfo("key1", &out_value));
   EXPECT_FALSE(node.GetMetaInfo("key2.subkey1", &out_value));
   EXPECT_FALSE(node.GetMetaInfo("key2.subkey2", &out_value));
   EXPECT_FALSE(node.GetMetaInfo("key2.subkey2.leaf", &out_value));
   EXPECT_FALSE(node.GetMetaInfoMap());
 }
 
 }  // namespace