Fix AutocompleteMatch DCHECK() triggered by |RenderViewContextMenu::AppendSearchProvider()|.

base/string_util.h

 // 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.
 //
 // This file defines utility functions for working with strings.
 
 #ifndef BASE_STRING_UTIL_H_
 #define BASE_STRING_UTIL_H_
 #pragma once
 
@@ skipping 155 matching lines @@
 BASE_EXPORT const std::string& EmptyString();
 BASE_EXPORT const std::wstring& EmptyWString();
 BASE_EXPORT const string16& EmptyString16();
 
 BASE_EXPORT extern const wchar_t kWhitespaceWide[];
 BASE_EXPORT extern const char16 kWhitespaceUTF16[];
 BASE_EXPORT extern const char kWhitespaceASCII[];
 
 BASE_EXPORT extern const char kUtf8ByteOrderMark[];
 
-// Removes characters in |remove_chars| from anywhere in input.  Returns true if
-// any characters were removed.  |remove_chars| must be null-terminated.
-// NOTE: Safe to use the same variable for both input and output.
+// Removes characters in |remove_chars| from anywhere in |input|.  Returns true
+// if any characters were removed.  |remove_chars| must be null-terminated.
+// NOTE: Safe to use the same variable for both |input| and |output|.
 BASE_EXPORT bool RemoveChars(const string16& input,
                              const char16 remove_chars[],
                              string16* output);
 BASE_EXPORT bool RemoveChars(const std::string& input,
                              const char remove_chars[],
                              std::string* output);
 
-// Removes characters in |trim_chars| from the beginning and end of input.
+// Replaces characters in |replace_chars| from anywhere in |input| with
+// |replace_with|.  Returns true if any characters were removed.

[Mark Mentovai, 2011/11/09 20:31:32]

Removed? Replaced!

[Mark Mentovai, 2011/11/09 20:31:32]

This doesn’t really explain whether ReplaceChars replaces by transliteration
(requiring replace_chars[] and replace_with to be the same length or something),
by replacing each char with the entire replace_with string, or something else.
The correct answer is #2, but I presumed that this behaved as #1 until I read
the code. This comment should make the precise behavior clear.

[Alexei Svitkine (slow), 2011/11/09 21:03:58]

Done.

[Alexei Svitkine (slow), 2011/11/09 21:03:58]

Done.

+// |replace_chars| must be null-terminated.
+// NOTE: Safe to use the same variable for both |input| and |output|.
+BASE_EXPORT bool ReplaceChars(const string16& input,
+                              const char16 replace_chars[],
+                              const string16& replace_with,
+                              string16* output);
+BASE_EXPORT bool ReplaceChars(const std::string& input,
+                              const char replace_chars[],
+                              const std::string& replace_with,
+                              std::string* output);
+
+// Removes characters in |trim_chars| from the beginning and end of |input|.
 // |trim_chars| must be null-terminated.
-// NOTE: Safe to use the same variable for both input and output.
+// NOTE: Safe to use the same variable for both |input| and |output|.
 BASE_EXPORT bool TrimString(const std::wstring& input,
                             const wchar_t trim_chars[],
                             std::wstring* output);
 BASE_EXPORT bool TrimString(const string16& input,
                             const char16 trim_chars[],
                             string16* output);
 BASE_EXPORT bool TrimString(const std::string& input,
                             const char trim_chars[],
                             std::string* output);
 
@@ skipping 226 matching lines @@
     std::string::size_type start_offset,
     const std::string& find_this,
     const std::string& replace_with);
 
 // Starting at |start_offset| (usually 0), look through |str| and replace all
 // instances of |find_this| with |replace_with|.
 //
 // This does entire substrings; use std::replace in <algorithm> for single
 // characters, for example:
 //   std::replace(str.begin(), str.end(), 'a', 'b');
 BASE_EXPORT void ReplaceSubstringsAfterOffset(

[Mark Mentovai, 2011/11/09 20:31:32]

We’ve got this, but it replaces substrings, not entire sets of characters. Maybe
this is what Will was thinking of. There’s also <algorithm> std::replace
(referenced by the comment above), but that, too, can only replace a single
character with another single character. Neither can replace sets of characters.

     string16* str,
     string16::size_type start_offset,
     const string16& find_this,
     const string16& replace_with);
 BASE_EXPORT void ReplaceSubstringsAfterOffset(
     std::string* str,
     std::string::size_type start_offset,
     const std::string& find_this,
     const std::string& replace_with);
 
@@ skipping 108 matching lines @@
 #elif defined(WCHAR_T_IS_UTF32)
   typedef uint32 Unsigned;
 #endif
 };
 template<>
 struct ToUnsigned<short> {
   typedef unsigned short Unsigned;
 };
 
 #endif  // BASE_STRING_UTIL_H_