Strip special characters in extension omnibox suggestions.

chrome/browser/autocomplete/extension_app_provider.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/extension_app_provider.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/string16.h"
@@ skipping 11 matching lines @@
     : AutocompleteProvider(listener, profile, "ExtensionApps") {
   RegisterForNotifications();
   RefreshAppList();
 }
 
 void ExtensionAppProvider::AddExtensionAppForTesting(const string16& app_name,
                                                      const string16& url) {
   extension_apps_.push_back(std::make_pair(app_name, url));
 }
 
+AutocompleteMatch ExtensionAppProvider::CreateAutocompleteMatch(
+  const AutocompleteInput& input,

[Peter Kasting, 2011/10/26 01:07:22]

Nit: Indent all these 4.

+  const string16& name,
+  const string16& url,
+  size_t name_match_index,
+  size_t url_match_index) {
+  // We have a match, might be a partial match.

[Peter Kasting, 2011/10/26 01:07:22]

Nit: This comment belongs in the caller.

+  // TODO(finnur): Figure out what type to return here, might want to have
+  // the extension icon/a generic icon show up in the Omnibox.
+  AutocompleteMatch match(this, 0, false,
+                          AutocompleteMatch::EXTENSION_APP);
+  match.fill_into_edit = url;
+  match.destination_url = GURL(url);
+  match.inline_autocomplete_offset = string16::npos;
+  match.contents = AutocompleteMatch::SanitizeString(name);
+  AutocompleteMatch::ClassifyLocationInString(name_match_index,
+                                              input.text().length(),
+                                              name.length(),
+                                              ACMatchClassification::NONE,
+                                              &match.contents_class);
+  match.description = url;
+  AutocompleteMatch::ClassifyLocationInString(url_match_index,
+                                              input.text().length(),
+                                              url.length(),
+                                              ACMatchClassification::URL,
+                                              &match.description_class);
+  match.relevance = CalculateRelevance(input.type(),
+                                       input.text().length(),
+                                       name_match_index != string16::npos ?
+                                           name.length() : url.length(),
+                                       match.destination_url);
+  return match;
+}
+
 void ExtensionAppProvider::Start(const AutocompleteInput& input,
                                  bool minimal_changes) {
   matches_.clear();
 
   if (input.type() == AutocompleteInput::INVALID)
     return;
 
   if (!input.text().empty()) {
     for (ExtensionApps::const_iterator app = extension_apps_.begin();
          app != extension_apps_.end(); ++app) {
       // See if the input matches this extension application.
       const string16& name = app->first;
       string16::const_iterator name_iter = std::search(name.begin(), name.end(),
           input.text().begin(), input.text().end(),
           base::CaseInsensitiveCompare<char16>());
       bool matches_name = name_iter != name.end();
       const string16& url = app->second;
       string16::const_iterator url_iter = std::search(url.begin(), url.end(),
           input.text().begin(), input.text().end(),
           base::CaseInsensitiveCompare<char16>());
       bool matches_url = url_iter != url.end() &&
                          input.type() != AutocompleteInput::FORCED_QUERY;
 
       if (matches_name || matches_url) {
-        // We have a match, might be a partial match.
-        // TODO(finnur): Figure out what type to return here, might want to have
-        // the extension icon/a generic icon show up in the Omnibox.
-        AutocompleteMatch match(this, 0, false,
-                                AutocompleteMatch::EXTENSION_APP);
-        match.fill_into_edit = url;
-        match.destination_url = GURL(url);
-        match.inline_autocomplete_offset = string16::npos;
-        match.contents = name;
-        AutocompleteMatch::ClassifyLocationInString(matches_name ?
-            static_cast<size_t>(name_iter - name.begin()) : string16::npos,
-            input.text().length(), name.length(), ACMatchClassification::NONE,
-            &match.contents_class);
-        match.description = url;
-        AutocompleteMatch::ClassifyLocationInString(matches_url ?
-            static_cast<size_t>(url_iter - url.begin()) : string16::npos,
-            input.text().length(), url.length(), ACMatchClassification::URL,
-            &match.description_class);
-        match.relevance = CalculateRelevance(input.type(),
-            input.text().length(), matches_name ? name.length() : url.length(),
-            match.destination_url);
-        matches_.push_back(match);
+        size_t name_match_index = matches_name ?
+            static_cast<size_t>(name_iter - name.begin()) : string16::npos;
+        size_t url_match_index = matches_url ?
+            static_cast<size_t>(url_iter - url.begin()) : string16::npos;
+        matches_.push_back(
+            CreateAutocompleteMatch(input, name, url, name_match_index,
+                                    url_match_index));
       }
     }
   }
 }
 
 ExtensionAppProvider::~ExtensionAppProvider() {
 }
 
 void ExtensionAppProvider::RefreshAppList() {
   ExtensionService* extension_service = profile_->GetExtensionService();
@@ skipping 60 matching lines @@
     history::URLRow info;
     url_db->GetRowForURL(url, &info);
     type_count_boost =
         400 * (1.0 - (std::pow(static_cast<double>(2), -info.typed_count())));
   }
   int relevance = 575 + static_cast<int>(type_count_boost) +
                         static_cast<int>(fraction_boost);
   DCHECK_LE(relevance, kMaxRelevance);
   return relevance;
 }