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

chrome/browser/autocomplete/autocomplete_match.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 "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "grit/theme_resources.h"
 
 // AutocompleteMatch ----------------------------------------------------------
 
+// static
+const char16 AutocompleteMatch::kInvalidChars[] = {
+  '\n', '\r', '\t',
+  0x2028,  // Line separator
+  0x2029,  // Paragraph separator
+  0
+};
+
 AutocompleteMatch::AutocompleteMatch()
     : provider(NULL),
       relevance(0),
       deletable(false),
       inline_autocomplete_offset(string16::npos),
       transition(content::PAGE_TRANSITION_GENERATED),
       is_history_what_you_typed_match(false),
       type(SEARCH_WHAT_YOU_TYPED),
       template_url(NULL),
       starred(false),
@@ skipping 132 matching lines @@
   const size_t after_match(match_location + match_length);
   if (after_match < overall_length) {
     classification->push_back(ACMatchClassification(after_match, style));
   }
 }
 
 // static
 string16 AutocompleteMatch::SanitizeString(const string16& text) {
   // NOTE: This logic is mirrored by |sanitizeString()| in
   // extension_process_bindings.js.
-  // 0x2028 = line separator; 0x2029 = paragraph separator.
-  const char16 kRemoveChars[] = { '\n', '\r', '\t',
-                                  0x2028,  // Line separator
-                                  0x2029,  // Paragraph separator
-                                  0 };
   string16 result;
   TrimWhitespace(text, TRIM_LEADING, &result);
-  RemoveChars(result, kRemoveChars, &result);
+  RemoveChars(result, kInvalidChars, &result);
   return result;
 }
 
 #ifndef NDEBUG
 void AutocompleteMatch::Validate() const {
   ValidateClassifications(contents, contents_class);
   ValidateClassifications(description, description_class);
 }
 
 void AutocompleteMatch::ValidateClassifications(
@@ skipping 13 matching lines @@
   // The classifications should always be sorted.
   size_t last_offset = classifications[0].offset;
   for (ACMatchClassifications::const_iterator i(classifications.begin() + 1);
        i != classifications.end(); ++i) {
     DCHECK(i->offset > last_offset) << "Classification unsorted";
     DCHECK(i->offset < text.length()) << "Classification out of bounds";
     last_offset = i->offset;
   }
 }
 #endif