Remove wstring from l10n_util. Part 8, the last part....

app/l10n_util.h

Index: app/l10n_util.h
===================================================================
--- app/l10n_util.h	(revision 70736)
+++ app/l10n_util.h	(working copy)
@@ -25,12 +25,6 @@
 #include "app/l10n_util_mac.h"
 #endif  // OS_MACOSX
 
-// http://crbug.com/9911 . Any functions bracketed by this define are going
-// away; this define exists to allow compiler assistance in removing their use.
-#if defined(TOOLKIT_VIEWS)
-#define CRBUG_9911_OBSOLETE_GOING_AWAY 1
-#endif
-
 namespace l10n_util {
 
 // This method is responsible for determining the locale as defined below. In
@@ -86,9 +80,6 @@
 //
 
 // 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);
 
@@ -108,47 +99,6 @@
                          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) {
-  return GetStringFUTF16(message_id, a);
-}
-inline std::wstring GetStringF(int message_id,
-                               const std::wstring& a,
-                               const std::wstring& b) {
-  return GetStringFUTF16(message_id, a, b);
-}
-inline std::wstring GetStringF(int message_id,
-                               const std::wstring& a,
-                               const std::wstring& b,
-                               const std::wstring& c) {
-  return GetStringFUTF16(message_id, a, b, c);
-}
-inline std::wstring GetStringF(int message_id,
-                               const std::wstring& a,
-                               const std::wstring& b,
-                               const std::wstring& c,
-                               const std::wstring& d) {
-  return GetStringFUTF16(message_id, a, b, c, d);
-}
-#else
-std::wstring GetStringF(int message_id,
-                        const std::wstring& a);
-std::wstring GetStringF(int message_id,
-                        const std::wstring& a,
-                        const std::wstring& b);
-std::wstring GetStringF(int message_id,
-                        const std::wstring& a,
-                        const std::wstring& b,
-                        const std::wstring& c);
-std::wstring GetStringF(int message_id,
-                        const std::wstring& a,
-                        const std::wstring& b,
-                        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,
@@ -168,15 +118,6 @@
 // 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);
-std::wstring GetStringF(int message_id,
-                        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);
@@ -186,10 +127,6 @@
                          std::vector<size_t>* offsets);
 
 // 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 GetStringFUTF16Int(int message_id, int a);
 string16 GetStringFUTF16Int(int message_id, int64 a);