Revert "Add UTF8 versions of GetString and GetStringF. This is useful for"

This reverts commit r13397.

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


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

2 files changed, 0 insertions, 39 deletions

diff --git a/chrome/common/l10n_util.cc b/chrome/common/l10n_util.cc
index ed85365..8d1a6f3 100644
--- a/chrome/common/l10n_util.cc
+++ b/chrome/common/l10n_util.cc
@@ -297,10 +297,6 @@ std::wstring GetString(int message_id) {
   return rb.GetLocalizedString(message_id);
 }
 
-std::string GetStringUTF8(int message_id) {
-  return WideToUTF8(GetString(message_id));
-}
-
 static std::wstring GetStringF(int message_id,
                                const std::wstring& a,
                                const std::wstring& b,
@@ -332,31 +328,6 @@ std::wstring GetStringF(int message_id,
   return GetStringF(message_id, a, b, c, std::wstring(), NULL);
 }
 
-std::string GetStringFUTF8(int message_id,
-                           const string16& a) {
-  // TODO(tc): Once this whole file uses string16, we can drop the UTF16ToWide
-  // conversions.
-  return WideToUTF8(GetStringF(message_id, UTF16ToWide(a)));
-}
-
-std::string GetStringFUTF8(int message_id,
-                           const string16& a,
-                           const string16& b) {
-  // TODO(tc): Once this whole file uses string16, we can drop the UTF16ToWide
-  // conversions.
-  return WideToUTF8(GetStringF(message_id, UTF16ToWide(a), UTF16ToWide(b)));
-}
-
-std::string GetStringF(int message_id,
-                       const string16& a,
-                       const string16& b,
-                       const string16& c) {
-  // TODO(tc): Once this whole file uses string16, we can drop the UTF16ToWide
-  // conversions.
-  return WideToUTF8(GetStringF(message_id, UTF16ToWide(a), UTF16ToWide(b),
-                               UTF16ToWide(c)));
-}
-
 std::wstring GetStringF(int message_id,
                         const std::wstring& a,
                         size_t* offset) {
diff --git a/chrome/common/l10n_util.h b/chrome/common/l10n_util.h
index 828112c..e26fe70 100644
--- a/chrome/common/l10n_util.h
+++ b/chrome/common/l10n_util.h
@@ -66,7 +66,6 @@ std::wstring GetLocalName(const std::string& locale_code_str,
 
 // Pulls resource string from the string bundle and returns it.
 std::wstring GetString(int message_id);
-std::string GetStringUTF8(int message_id);
 
 // Get a resource string and replace $1-$2-$3 with |a| and |b|
 // respectively.  Additionally, $$ is replaced by $.
@@ -79,15 +78,6 @@ std::wstring GetStringF(int message_id,
                         const std::wstring& a,
                         const std::wstring& b,
                         const std::wstring& c);
-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);
 
 // Variants that return the offset(s) of the replaced parameters. The
 // vector based version returns offsets ordered by parameter. For example if