Remove wstring from l10n_util. Part 2....

app/l10n_util.h

 // 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.
 
 // This file contains utility functions for dealing with localized
 // content.
 
 #ifndef APP_L10N_UTIL_H_
 #define APP_L10N_UTIL_H_
 #pragma once
@@ skipping 165 matching lines @@
                         std::vector<size_t>* offsets);
 #endif
 string16 GetStringFUTF16(int message_id,
                          const string16& a,
                          size_t* offset);
 string16 GetStringFUTF16(int message_id,
                          const string16& a,
                          const string16& b,
                          std::vector<size_t>* offsets);
 
-// Convenience formatters for a single number.
+// Convenience functions to get a string with a single number as a parameter.
 #if CRBUG_9911_OBSOLETE_GOING_AWAY
 std::wstring GetStringF(int message_id, int a);
 std::wstring GetStringF(int message_id, int64 a);
 #endif
-string16 GetStringFUTF16(int message_id, int a);
-string16 GetStringFUTF16(int message_id, int64 a);
+string16 GetStringFUTF16Int(int message_id, int a);
+string16 GetStringFUTF16Int(int message_id, int64 a);
 
 // Truncates the string to length characters. This breaks the string at
 // the first word break before length, adding the horizontal ellipsis
 // character (unicode character 0x2026) to render ...
 // The supplied string is returned if the string has length characters or
 // less.
 string16 TruncateString(const string16& string, size_t length);
 
 // Returns the lower case equivalent of string.
 string16 ToLower(const string16& string);
@@ skipping 10 matching lines @@
 const std::vector<std::string>& GetAvailableLocales();
 
 // Returns a vector of locale codes usable for accept-languages.
 void GetAcceptLanguagesForLocale(const std::string& display_locale,
                                  std::vector<std::string>* locale_codes);
 
 
 }  // namespace l10n_util
 
 #endif  // APP_L10N_UTIL_H_