Move the number conversions from string_util to a new file....

app/l10n_util.cc

 // Copyright (c) 2010 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 "app/l10n_util.h"
 
 #include <cstdlib>
 
 #include "app/app_paths.h"
 #include "app/l10n_util_collator.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/i18n/rtl.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
-#include "base/string_piece.h"
-#include "base/string_util.h"
+#include "base/string_number_conversions.h"
 #include "base/sys_string_conversions.h"
 #include "build/build_config.h"
 #include "gfx/canvas.h"
 #include "unicode/rbbi.h"
 
 #if defined(OS_MACOSX)
 #include "app/l10n_util_mac.h"
 #endif
 
 // TODO(playmobil): remove this undef once SkPostConfig.h is fixed.
@@ skipping 610 matching lines @@
 }
 
 string16 GetStringFUTF16(int message_id,
                         const string16& a,
                         const string16& b,
                         std::vector<size_t>* offsets) {
   return GetStringF(message_id, a, b, string16(), string16(), offsets);
 }
 
 std::wstring GetStringF(int message_id, int a) {
-  return GetStringF(message_id, IntToWString(a));
+  return GetStringF(message_id, UTF8ToWide(base::IntToString(a)));
 }
 
 std::wstring GetStringF(int message_id, int64 a) {
-  return GetStringF(message_id, Int64ToWString(a));
+  return GetStringF(message_id, UTF8ToWide(base::Int64ToString(a)));
 }
 
 std::wstring TruncateString(const std::wstring& string, size_t length) {
   if (string.size() <= length)
     // String fits, return it.
     return string;
 
   if (length == 0) {
     // No room for the ellide string, return an empty string.
     return std::wstring(L"");
@@ skipping 186 matching lines @@
   for (size_t i = 0; i < arraysize(kAcceptLanguageList); ++i) {
     if (!IsLocaleNameTranslated(kAcceptLanguageList[i], display_locale))
       // TODO(jungshik) : Put them at the of the list with language codes
       // enclosed by brackets instead of skipping.
         continue;
     locale_codes->push_back(kAcceptLanguageList[i]);
   }
 }
 
 }  // namespace l10n_util