Remove the dependency on i18n/icu_string_conversions from base/string_util.h.

Fix up all files requireing this header to include it directly. Split out the
ICU-dependent string util unit tests into a new file
base/i18n/icu_string_util_unittest.cc

TEST=none
BUG=none
Review URL: http://codereview.chromium.org/269034

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

1 files changed, 5 insertions, 4 deletions

diff --git a/net/base/escape.cc b/net/base/escape.cc
index 615f062..3d2aca2 100644
--- a/net/base/escape.cc
+++ b/net/base/escape.cc
@@ -6,6 +6,7 @@
 
 #include "net/base/escape.h"
 
+#include "base/i18n/icu_string_conversions.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 
@@ -220,8 +221,8 @@ bool EscapeQueryParamValue(const std::wstring& text, const char* codepage,
   // TODO(brettw) bug 1201094: this function should be removed, this "SKIP"
   // behavior is wrong when the character can't be encoded properly.
   std::string encoded;
-  if (!WideToCodepage(text, codepage,
-                      OnStringUtilConversionError::SKIP, &encoded))
+  if (!base::WideToCodepage(text, codepage,
+                            base::OnStringConversionError::SKIP, &encoded))
     return false;
 
   // It's safe to use UTF8ToWide here because Escape should only return
@@ -234,8 +235,8 @@ std::wstring UnescapeAndDecodeURLComponent(const std::string& text,
                                            const char* codepage,
                                            UnescapeRule::Type rules) {
   std::wstring result;
-  if (CodepageToWide(UnescapeURLImpl(text, rules), codepage,
-                     OnStringUtilConversionError::FAIL, &result))
+  if (base::CodepageToWide(UnescapeURLImpl(text, rules), codepage,
+                           base::OnStringConversionError::FAIL, &result))
     return result;          // Character set looks like it's valid.
   return UTF8ToWide(text);  // Return the escaped version when it's not.
 }