Escape search terms correctly in the path portion of a custom search engine.

net/base/escape_unittest.cc

 // 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.
 
 #include <algorithm>
 #include <string>
 
 #include "net/base/escape.h"
 
 #include "base/basictypes.h"
@@ skipping 50 matching lines @@
 };
 
 TEST(EscapeTest, EscapeTextForFormSubmission) {
   const EscapeCase escape_cases[] = {
     {"foo", "foo"},
     {"foo bar", "foo+bar"},
     {"foo++", "foo%2B%2B"}
   };
   for (size_t i = 0; i < arraysize(escape_cases); ++i) {
     EscapeCase value = escape_cases[i];
-    EXPECT_EQ(UTF8ToUTF16(value.output),
-              EscapeQueryParamValueUTF8(UTF8ToUTF16(value.input), true));
+    EXPECT_EQ(value.output, EscapeQueryParamValue(value.input, true));
   }
 
   const EscapeCase escape_cases_no_plus[] = {
     {"foo", "foo"},
     {"foo bar", "foo%20bar"},
     {"foo++", "foo%2B%2B"}
   };
   for (size_t i = 0; i < arraysize(escape_cases_no_plus); ++i) {
     EscapeCase value = escape_cases_no_plus[i];
-    EXPECT_EQ(ASCIIToUTF16(value.output),
-              EscapeQueryParamValueUTF8(ASCIIToUTF16(value.input), false));
+    EXPECT_EQ(value.output, EscapeQueryParamValue(value.input, false));
   }
 
   // Test all the values in we're supposed to be escaping.
   const std::string no_escape(
     "abcdefghijklmnopqrstuvwxyz"
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
     "0123456789"
     "!'()*-._~");
   for (int i = 0; i < 256; ++i) {
     std::string in;
     in.push_back(i);
     std::string out = EscapeQueryParamValue(in, true);
     if (0 == i) {
       EXPECT_EQ(out, std::string("%00"));
     } else if (32 == i) {
       // Spaces are plus escaped like web forms.
       EXPECT_EQ(out, std::string("+"));
     } else if (no_escape.find(in) == std::string::npos) {
       // Check %hex escaping
       std::string expected = base::StringPrintf("%%%02X", i);
       EXPECT_EQ(expected, out);
     } else {
       // No change for things in the no_escape list.
       EXPECT_EQ(out, in);
     }
   }
-
-  // Check to see if EscapeQueryParamValueUTF8 is the same as
-  // EscapeQueryParamValue(..., kCodepageUTF8,)
-  string16 test_str;
-  test_str.reserve(5000);
-  for (int i = 1; i < 5000; ++i) {
-    test_str.push_back(i);
-  }
-  string16 utf16;
-  EXPECT_TRUE(EscapeQueryParamValue(test_str, base::kCodepageUTF8, true,
-                                    &utf16));
-  EXPECT_EQ(utf16, EscapeQueryParamValueUTF8(test_str, true));
-  EXPECT_TRUE(EscapeQueryParamValue(test_str, base::kCodepageUTF8, false,
-                                    &utf16));
-  EXPECT_EQ(utf16, EscapeQueryParamValueUTF8(test_str, false));
 }
 
 TEST(EscapeTest, EscapePath) {
   ASSERT_EQ(
     // Most of the character space we care about, un-escaped
     EscapePath(
       "\x02\n\x1d !\"#$%&'()*+,-./0123456789:;"
       "<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ"
       "[\\]^_`abcdefghijklmnopqrstuvwxyz"
       "{|}~\x7f\x80\xff"),
@@ skipping 303 matching lines @@
                 internal::AdjustEncodingOffset(adjustments));
   size_t expected_2[] = {0, kNpos, kNpos, 1, 2, 3, 4, kNpos, kNpos, 5, kNpos,
                          kNpos, 6, 7, 8, 9, kNpos, kNpos};
   EXPECT_EQ(offsets.size(), arraysize(expected_2));
   for (size_t i = 0; i < arraysize(expected_2); ++i)
     EXPECT_EQ(expected_2[i], offsets[i]);
 }
 
 }  // namespace
 }  // namespace net