Strip special characters in extension omnibox suggestions.

chrome/browser/autocomplete/autocomplete.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 "chrome/browser/autocomplete/autocomplete.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 634 matching lines @@
   old_matches.BuildProviderToMatches(&old_matches_per_provider);
   for (ProviderToMatches::const_iterator i = old_matches_per_provider.begin();
        i != old_matches_per_provider.end(); ++i) {
     MergeMatchesByProvider(i->second, matches_per_provider[i->first]);
   }
 
   SortAndCull(input);
 }
 
 void AutocompleteResult::AppendMatches(const ACMatches& matches) {
+#ifndef NDEBUG
+  for (size_t i = 0; i < matches.size(); i++) {

[Peter Kasting, 2011/10/25 20:37:07]

Nit: This code tries to use iterators (begin() and end()) as much as possible.

[Alexei Svitkine (slow), 2011/10/25 21:37:16]

Done.

+    DCHECK_EQ(AutocompleteMatch::SanitizeString(matches[i].contents),

[Peter Kasting, 2011/10/25 20:37:07]

Nit: Here and below, we should also check the description.

[Alexei Svitkine (slow), 2011/10/25 21:37:16]

Done.

+              matches[i].contents);
+  }
+#endif
   std::copy(matches.begin(), matches.end(), std::back_inserter(matches_));
   default_match_ = end();
   alternate_nav_url_ = GURL();
 }
 
 void AutocompleteResult::AddMatch(const AutocompleteMatch& match) {
   DCHECK(default_match_ != end());
+  // Check that there are no invalid characters in |match.contents|.

[Peter Kasting, 2011/10/25 20:37:07]

Nit: Remove this comment, it's redundant with the code.

[Alexei Svitkine (slow), 2011/10/25 21:37:16]

Done.

+  DCHECK_EQ(AutocompleteMatch::SanitizeString(match.contents), match.contents);
   ACMatches::iterator insertion_point =
       std::upper_bound(begin(), end(), match, &AutocompleteMatch::MoreRelevant);
   ACMatches::iterator::difference_type default_offset =
       default_match_ - begin();
   if ((insertion_point - begin()) <= default_offset)
     ++default_offset;
   matches_.insert(insertion_point, match);
   default_match_ = begin() + default_offset;
 }
 
@@ skipping 371 matching lines @@
   }
   done_ = true;
 }
 
 void AutocompleteController::StartExpireTimer() {
   if (result_.HasCopiedMatches())
     expire_timer_.Start(FROM_HERE,
                         base::TimeDelta::FromMilliseconds(kExpireTimeMS),
                         this, &AutocompleteController::ExpireCopiedEntries);
 }