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

net/base/escape.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 "net/base/escape.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 229 matching lines @@
 
 // Everything except alphanumerics, the reserved characters(;/?:@&=+$,) and
 // !'()*-._~%
 static const Charmap kExternalHandlerCharmap = {{
   0xffffffffL, 0x5000080dL, 0x68000000L, 0xb8000001L,
   0xffffffffL, 0xffffffffL, 0xffffffffL, 0xffffffffL
 }};
 
 }  // namespace
 
+std::string EscapeQueryParamValue(const std::string& text, bool use_plus) {
+  return Escape(text, kQueryCharmap, use_plus);
+}
+
 std::string EscapePath(const std::string& path) {
   return Escape(path, kPathCharmap, false);
 }
 
 std::string EscapeUrlEncodedData(const std::string& path, bool use_plus) {
   return Escape(path, kUrlEscape, use_plus);
 }
 
 std::string EscapeNonASCII(const std::string& input) {
   return Escape(input, kNonASCIICharmap, false);
@@ skipping 87 matching lines @@
           text.replace(iter, iter + ampersand_chars[i].length(),
                        1, kEscapeToChars[i].replacement);
           break;
         }
       }
     }
   }
   return text;
 }
 
-std::string EscapeQueryParamValue(const std::string& text, bool use_plus) {
-  return Escape(text, kQueryCharmap, use_plus);
-}
-
-// Convert the string to a sequence of bytes and then % escape anything
-// except alphanumerics and !'()*-._~
-string16 EscapeQueryParamValueUTF8(const string16& text, bool use_plus) {
-  return UTF8ToUTF16(Escape(UTF16ToUTF8(text), kQueryCharmap, use_plus));
-}
-
 namespace internal {
 
 AdjustEncodingOffset::AdjustEncodingOffset(const Adjustments& adjustments)
   : adjustments(adjustments) {}
 
 void AdjustEncodingOffset::operator()(size_t& offset) {
   // For each encoded character occurring before an offset subtract 2.
   if (offset == string16::npos)
     return;
   size_t adjusted_offset = offset;
   for (Adjustments::const_iterator i = adjustments.begin();
        i != adjustments.end(); ++i) {
     size_t location = *i;
     if (offset <= location) {
       offset = adjusted_offset;
       return;
     }
     if (offset <= (location + 2)) {
       offset = string16::npos;
       return;
     }
     adjusted_offset -= 2;
   }
   offset = adjusted_offset;
 }
 
 }  // namespace internal
 
 }  // namespace net