Remove wstring from l10n_util. Part 2.

BUG=9911
TEST=no visible changes; all tests pass

Review URL: http://codereview.chromium.org/5959008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70242 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 6 insertions, 6 deletions

diff --git a/app/l10n_util.cc b/app/l10n_util.cc
index 6add000..e4d1893 100644
--- a/app/l10n_util.cc
+++ b/app/l10n_util.cc
@@ -779,11 +779,11 @@ std::wstring GetStringF(int message_id, int64 a) {
 }
 #endif
 
-string16 GetStringFUTF16(int message_id, int a) {
+string16 GetStringFUTF16Int(int message_id, int a) {
   return GetStringFUTF16(message_id, UTF8ToUTF16(base::IntToString(a)));
 }
 
-string16 GetStringFUTF16(int message_id, int64 a) {
+string16 GetStringFUTF16Int(int message_id, int64 a) {
   return GetStringFUTF16(message_id, UTF8ToUTF16(base::Int64ToString(a)));
 }
 
diff --git a/app/l10n_util.h b/app/l10n_util.h
index 57fd690..1e20984 100644
--- a/app/l10n_util.h
+++ b/app/l10n_util.h
@@ -183,13 +183,13 @@ string16 GetStringFUTF16(int message_id,
                          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
diff --git a/app/l10n_util_unittest.cc b/app/l10n_util_unittest.cc
index b6c6b9b..069ad62d 100644
--- a/app/l10n_util_unittest.cc
+++ b/app/l10n_util_unittest.cc
@@ -57,7 +57,7 @@ TEST_F(L10nUtilTest, DISABLED_GetString) {
                                 UTF8ToUTF16("10"));
   EXPECT_EQ(std::string("Hello, chrome. Your number is 10."), s);
 
-  string16 s16 = l10n_util::GetStringFUTF16(IDS_PLACEHOLDERS_2, 20);
+  string16 s16 = l10n_util::GetStringFUTF16Int(IDS_PLACEHOLDERS_2, 20);
   EXPECT_EQ(UTF8ToUTF16("You owe me $20."), s16);
 }
 #endif  // defined(OS_WIN)