Strip special characters in extension omnibox suggestions.

chrome/browser/autocomplete/keyword_provider.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 contains the keyword autocomplete provider. The keyword provider
 // is responsible for remembering/suggesting user "search keyword queries"
 // (e.g.  "imdb Godzilla") and then fixing them up into valid URLs.  An
 // instance of it gets created and managed by the autocomplete controller.
 // KeywordProvider uses a TemplateURLService to find the set of keywords.
 //
 // For more information on the autocomplete system in general, including how
 // the autocomplete controller and autocomplete providers work, see
 // chrome/browser/autocomplete.h.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_KEYWORD_PROVIDER_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_KEYWORD_PROVIDER_H_
 #pragma once
 
 #include <string>
+#include <vector>
 
+#include "base/gtest_prod_util.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
+struct ExtensionOmniboxSuggestion;
 class Profile;
 class TemplateURL;
 class TemplateURLService;
 
 // Autocomplete provider for keyword input.
 //
 // After construction, the autocomplete controller repeatedly calls Start()
 // with some user input, each time expecting to receive a small set of the best
 // matches (either synchronously or asynchronously).
 //
@@ skipping 88 matching lines @@
   // Creates a fully marked-up AutocompleteMatch from the user's input.
   // If |relevance| is negative, calculate a relevance based on heuristics.
   AutocompleteMatch CreateAutocompleteMatch(
       TemplateURLService* model,
       const string16& keyword,
       const AutocompleteInput& input,
       size_t prefix_length,
       const string16& remaining_input,
       int relevance);
 
+  // Creates an AutocompleteMatch from an extension omnibox suggestion.
+  AutocompleteMatch CreateAutocompleteMatchFromSuggestion(

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

Nit: Same comments.

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

Same reply as to the other one.

+      TemplateURLService* model,
+      const string16& keyword,
+      const AutocompleteInput& input,
+      const ExtensionOmniboxSuggestion& suggestion,
+      int relevance);
+
   void EnterExtensionKeywordMode(const std::string& extension_id);
   void MaybeEndExtensionKeywordMode();
 
   // content::NotificationObserver interface.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details);
 
   // Model for the keywords.  This is only non-null when testing, otherwise the
   // TemplateURLService from the Profile is used.
@@ skipping 11 matching lines @@
   // We remember the last suggestions we've received from the extension in case
   // we need to reset our matches without asking the extension again.
   std::vector<AutocompleteMatch> extension_suggest_matches_;
 
   // If non-empty, holds the ID of the extension whose keyword is currently in
   // the URL bar while the autocomplete popup is open.
   std::string current_keyword_extension_id_;
 
   content::NotificationRegistrar registrar_;
 
+  FRIEND_TEST_ALL_PREFIXES(KeywordProviderTest, SuggestionMatchSanitize);
+
   DISALLOW_COPY_AND_ASSIGN(KeywordProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_KEYWORD_PROVIDER_H_