Move UTF16ToASCII, remove WideToASCII.

ui/base/l10n/l10n_util_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 "ui/base/l10n/l10n_util_win.h"
 
 #include <windowsx.h>
 #include <algorithm>
 #include <iterator>
 
 #include "base/i18n/rtl.h"
 #include "base/lazy_instance.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/win/i18n.h"
 #include "base/win/windows_version.h"
 #include "grit/app_locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/win/dpi.h"
 
 namespace {
 
 void AdjustLogFont(const base::string16& font_family,
@@ skipping 154 matching lines @@
       double dpi_scale = 1;
       AdjustLogFont(ui_font_family, ui_font_size_scaler, dpi_scale, &logfont);
       HFONT hfont = CreateFontIndirect(&logfont);
       if (hfont)
         SetWindowFont(hwnd, hfont, FALSE);
     }
   }
 }
 
 void OverrideLocaleWithUILanguageList() {
-  std::vector<std::wstring> ui_languages;
+  std::vector<base::string16> ui_languages;
   if (base::win::i18n::GetThreadPreferredUILanguageList(&ui_languages)) {
     std::vector<std::string> ascii_languages;
     ascii_languages.reserve(ui_languages.size());
     std::transform(ui_languages.begin(), ui_languages.end(),
-                   std::back_inserter(ascii_languages), &WideToASCII);
+                   std::back_inserter(ascii_languages), &base::UTF16ToASCII);
     override_locale_holder.Get().swap_value(&ascii_languages);
   } else {
     NOTREACHED() << "Failed to determine the UI language for locale override.";
   }
 }
 
 const std::vector<std::string>& GetLocaleOverrides() {
   return override_locale_holder.Get().value();
 }
 
 }  // namespace l10n_util