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

app/l10n_util.h

 // Copyright (c) 2011 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
 
 #include <algorithm>
 #include <functional>
 #include <string>
 #include <vector>
 
 #include "build/build_config.h"
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 
 #if defined(OS_MACOSX)
 #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
 // nearly all cases you shouldn't call this, rather use GetApplicationLocale
 // defined on browser_process.
 //
 // Returns the locale used by the Application.  First we use the value from the
 // command line (--lang), second we try the value in the prefs file (passed in
 // as |pref_locale|), finally, we fall back on the system locale. We only return
 // a value if there's a corresponding resource DLL for the locale.  Otherwise,
@@ skipping 35 matching lines @@
 // accepted, but 'z', 'German', 'en-$1', or 'abcd-1234' should not.
 // Case-insensitive. Based on BCP 47, see:
 //   http://unicode.org/reports/tr35/#Unicode_Language_and_Locale_Identifiers
 bool IsValidLocaleSyntax(const std::string& locale);
 
 //
 // Mac Note: See l10n_util_mac.h for some NSString versions and other support.
 //
 
 // 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);
 
 // Get a resource string and replace $1-$2-$3 with |a| and |b|
 // respectively.  Additionally, $$ is replaced by $.
 string16 GetStringFUTF16(int message_id,
                          const string16& a);
 string16 GetStringFUTF16(int message_id,
                          const string16& a,
                          const string16& b);
 string16 GetStringFUTF16(int message_id,
                          const string16& a,
                          const string16& b,
                          const string16& c);
 string16 GetStringFUTF16(int message_id,
                          const string16& a,
                          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,
                            const string16& a,
                            const string16& b);
 std::string GetStringFUTF8(int message_id,
                            const string16& a,
                            const string16& b,
                            const string16& c);
 std::string GetStringFUTF8(int message_id,
                            const string16& a,
                            const string16& b,
                            const string16& c,
                            const string16& d);
 
 // Variants that return the offset(s) of the replaced parameters. The
 // 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);
 string16 GetStringFUTF16(int message_id,
                          const string16& a,
                          const string16& b,
                          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);
 
 // 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);
 
@@ skipping 12 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_