Remove wstring from l10n_util. Part 1....

app/l10n_util.h

Index: app/l10n_util.h
===================================================================
--- app/l10n_util.h	(revision 70069)
+++ app/l10n_util.h	(working copy)
@@ -25,6 +25,8 @@
 #include "app/l10n_util_mac.h"
 #endif  // OS_MACOSX
 
+#define CRBUG_9911_OBSOLETE_GOING_AWAY 1

[Evan Martin, 2010/12/24 01:00:42]

Can you comment this?  (Add a link to the bug, describe why you have it, etc.)

[Avi (use Gerrit), 2010/12/28 15:02:55]

Done.

+
 namespace l10n_util {
 
 // This method is responsible for determining the locale as defined below. In
@@ -80,7 +82,9 @@
 //
 
 // Pulls resource string from the string bundle and returns it.
+#if CRBUG_9911_OBSOLETE_GOING_AWAY
 std::wstring GetString(int message_id);
+#endif
 std::string GetStringUTF8(int message_id);
 string16 GetStringUTF16(int message_id);
 
@@ -100,6 +104,7 @@
                          const string16& b,
                          const string16& c,
                          const string16& d);
+#if CRBUG_9911_OBSOLETE_GOING_AWAY
 #if defined(WCHAR_T_IS_UTF16)
 inline std::wstring GetStringF(int message_id,
                                const std::wstring& a) {
@@ -139,6 +144,7 @@
                         const std::wstring& c,
                         const std::wstring& d);
 #endif
+#endif
 std::string GetStringFUTF8(int message_id,
                            const string16& a);
 std::string GetStringFUTF8(int message_id,
@@ -158,6 +164,7 @@
 // vector based version returns offsets ordered by parameter. For example if
 // invoked with a and b offsets[0] gives the offset for a and offsets[1] the
 // offset of b regardless of where the parameters end up in the string.
+#if CRBUG_9911_OBSOLETE_GOING_AWAY
 std::wstring GetStringF(int message_id,
                         const std::wstring& a,
                         size_t* offset);
@@ -165,6 +172,7 @@
                         const std::wstring& a,
                         const std::wstring& b,
                         std::vector<size_t>* offsets);
+#endif
 string16 GetStringFUTF16(int message_id,
                          const string16& a,
                          size_t* offset);
@@ -174,8 +182,12 @@
                          std::vector<size_t>* offsets);
 
 // Convenience formatters for a single number.
+#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);
 
 // Truncates the string to length characters. This breaks the string at
 // the first word break before length, adding the horizontal ellipsis
@@ -190,10 +202,6 @@
 // Returns the upper case equivalent of string.
 string16 ToUpper(const string16& string);
 
-// In place sorting of std::wstring strings using collation rules for |locale|.
-void SortStrings(const std::string& locale,
-                 std::vector<std::wstring>* strings);
-
 // In place sorting of string16 strings using collation rules for |locale|.
 void SortStrings16(const std::string& locale,
                    std::vector<string16>* strings);