Move UTF16ToASCII, remove WideToASCII.

chrome/browser/enumerate_modules_model_unittest_win.cc

 // Copyright (c) 2011 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 "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/enumerate_modules_model_win.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 186 matching lines @@
 };
 
 TEST_F(EnumerateModulesTest, MatchFunction) {
   for (size_t i = 0; i < arraysize(kMatchineEntryList); ++i) {
     ModuleEnumerator::Module test = kMatchineEntryList[i].test_case;
     ModuleEnumerator::NormalizeModule(&test);
     ModuleEnumerator::BlacklistEntry blacklist =
         kMatchineEntryList[i].blacklist;
 
     SCOPED_TRACE("Test case no " + base::IntToString(i) +
-                 ": '" + UTF16ToASCII(test.name) + "'");
+                 ": '" + base::UTF16ToASCII(test.name) + "'");
     EXPECT_EQ(kMatchineEntryList[i].expected_result,
               ModuleEnumerator::Match(test, blacklist));
   }
 }
 
 const struct CollapsePathList {
   base::string16 expected_result;
   base::string16 test_case;
 } kCollapsePathList[] = {
   // Negative testing (should not collapse this path).
@@ skipping 10 matching lines @@
   module_enumerator->path_mapping_.push_back(
       std::make_pair(L"c:\\foo\\", L"%foo%"));
   module_enumerator->path_mapping_.push_back(
       std::make_pair(L"c:\\foo\\bar\\", L"%x%"));
 
   for (size_t i = 0; i < arraysize(kCollapsePathList); ++i) {
     ModuleEnumerator::Module module;
     module.location = kCollapsePathList[i].test_case;
     module_enumerator->CollapsePath(&module);
 
-    SCOPED_TRACE("Test case no " + base::IntToString(i) +
-                 ": '" + UTF16ToASCII(kCollapsePathList[i].expected_result) +
+    SCOPED_TRACE("Test case no " + base::IntToString(i) + ": '" +
+                 base::UTF16ToASCII(kCollapsePathList[i].expected_result) +
                  "'");
     EXPECT_EQ(kCollapsePathList[i].expected_result, module.location);
   }
 }