Update from https://crrev.com/329939

base/i18n/icu_string_conversions.h

Index: base/i18n/icu_string_conversions.h
diff --git a/base/i18n/icu_string_conversions.h b/base/i18n/icu_string_conversions.h
index fd2ae46c529684ae0bf68d77b9b82b7ba2000e7f..9135da86a216df2830f53b76b4366816845ef674 100644
--- a/base/i18n/icu_string_conversions.h
+++ b/base/i18n/icu_string_conversions.h
@@ -13,8 +13,7 @@
 
 namespace base {
 
-// Defines the error handling modes of UTF16ToCodepage, CodepageToUTF16,
-// WideToCodepage and CodepageToWide.
+// Defines the error handling modes of UTF16ToCodepage and CodepageToUTF16.
 class OnStringConversionError {
  public:
   enum Type {
@@ -47,18 +46,6 @@ BASE_I18N_EXPORT bool CodepageToUTF16(const std::string& encoded,
                                       OnStringConversionError::Type on_error,
                                       string16* utf16);
 
-// Converts between wide strings and the encoding specified.  If the
-// encoding doesn't exist or the encoding fails (when on_error is FAIL),
-// returns false.
-BASE_I18N_EXPORT bool WideToCodepage(const std::wstring& wide,
-                                     const char* codepage_name,
-                                     OnStringConversionError::Type on_error,
-                                     std::string* encoded);
-BASE_I18N_EXPORT bool CodepageToWide(const std::string& encoded,
-                                     const char* codepage_name,
-                                     OnStringConversionError::Type on_error,
-                                     std::wstring* wide);
-
 // Converts from any codepage to UTF-8 and ensures the resulting UTF-8 is
 // normalized.
 BASE_I18N_EXPORT bool ConvertToUtf8AndNormalize(const std::string& text,