Remove std::wstring from most of net/base/escape.h.

I left the one API because based on the comment, it should eventually be
removed. Updated the callers to use UTF16ToWideHack until more work can be done
to remove std::wstring. I also updated net/base/escape_unittest.cc to use the
same hack until a proper solution can be coded.

Original patch submission here:
http://codereview.chromium.org/402085

Patch by Patrick Scott (phanna@android.com)
R=darin
BUG=23581
TEST=escape_unittest

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

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

1 files changed, 7 insertions, 5 deletions

diff --git a/net/base/escape_unittest.cc b/net/base/escape_unittest.cc
index 8e5e7dc..f350117f 100644
--- a/net/base/escape_unittest.cc
+++ b/net/base/escape_unittest.cc
@@ -88,14 +88,15 @@ TEST(EscapeTest, EscapeTextForFormSubmission) {
 
   // Check to see if EscapeQueryParamValueUTF8 is the same as
   // EscapeQueryParamValue(..., kCodepageUTF8,)
-  std::wstring test_str;
+  string16 test_str;
   test_str.reserve(5000);
   for (int i = 1; i < 5000; ++i) {
     test_str.push_back(i);
   }
-  std::wstring wide;
+  string16 wide;
   EXPECT_TRUE(EscapeQueryParamValue(test_str, base::kCodepageUTF8, &wide));
-  EXPECT_EQ(wide, EscapeQueryParamValueUTF8(test_str));
+  EXPECT_EQ(UTF16ToWideHack(wide),
+            EscapeQueryParamValueUTF8(UTF16ToWideHack(test_str)));
 }
 
 TEST(EscapeTest, EscapePath) {
@@ -243,9 +244,10 @@ TEST(EscapeTest, UnescapeAndDecodeUTF8URLComponent) {
     EXPECT_EQ(std::string(unescape_cases[i].query_unescaped), unescaped);
 
     // TODO: Need to test unescape_spaces and unescape_percent.
-    std::wstring decoded = UnescapeAndDecodeUTF8URLComponent(
+    string16 decoded = UnescapeAndDecodeUTF8URLComponent(
         unescape_cases[i].input, UnescapeRule::NORMAL, NULL);
-    EXPECT_EQ(std::wstring(unescape_cases[i].decoded), decoded);
+    EXPECT_EQ(WideToUTF16Hack(std::wstring(unescape_cases[i].decoded)),
+              decoded);
   }
 }