Part 4 of search provider refactoring.

chrome/browser/autocomplete/zero_suggest_provider.h

 // Copyright (c) 2012 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 zero-suggest autocomplete provider. This experimental
 // provider is invoked when the user focuses in the omnibox prior to editing,
 // and generates search query suggestions based on the current URL. To enable
 // this provider, point --experimental-zero-suggest-url-prefix at an
 // appropriate suggestion service.
 //
@@ skipping 54 matching lines @@
       const GURL& curent_page_url,
       AutocompleteInput::PageClassification page_classification,
       const base::string16& permanent_text);
 
  private:
   ZeroSuggestProvider(AutocompleteProviderListener* listener,
                       Profile* profile);
 
   virtual ~ZeroSuggestProvider();
 
+  // BaseSearchProvider:
+  virtual const TemplateURL* GetTemplateURL(
+      const SuggestResult& result) const OVERRIDE;
+  virtual const AutocompleteInput GetInput(
+      const SuggestResult& result) const OVERRIDE;
+  virtual bool ShouldAppendExtraParams(
+      const SuggestResult& result) const OVERRIDE;
+
   // The 4 functions below (that take classes defined in SearchProvider as
   // arguments) were copied and trimmed from SearchProvider.
   // TODO(hfung): Refactor them into a new base class common to both
   // ZeroSuggestProvider and SearchProvider.
 
   // From the OpenSearch formatted response |root_val|, populate query
   // suggestions into |suggest_results|, navigation suggestions into
   // |navigation_results|, and the verbatim relevance score into
   // |verbatim_relevance|.
   void FillResults(const base::Value& root_val,
                    int* verbatim_relevance,
                    SuggestResults* suggest_results,
                    NavigationResults* navigation_results);
 
-  // Creates AutocompleteMatches to search |template_url| for "<suggestion>" for
+  // Creates AutocompleteMatches to search for "<suggestion>" for

[msw, 2014/02/13 22:47:18]

nit: consider "Adds AutocompleteMatches for each of the suggestions in |results|
to |map|." or similar.

[Maria, 2014/02/13 23:19:23]

Done.

   // all suggestions in |results|, and adds them to |map|.
   void AddSuggestResultsToMap(const SuggestResults& results,
-                              const TemplateURL* template_url,
                               MatchMap* map);
 
-  // Creates an AutocompleteMatch with the provided |relevance| and |type| to
-  // search |template_url| for |query_string|.  |accepted_suggestion| will be
-  // used to generate Assisted Query Stats.
-  //
-  // Adds this match to |map|; if such a match already exists, whichever one
-  // has lower relevance is eliminated.
-  void AddMatchToMap(int relevance,
-                     AutocompleteMatch::Type type,
-                     const TemplateURL* template_url,
-                     const base::string16& query_string,
-                     int accepted_suggestion,
-                     MatchMap* map);
-
   // Returns an AutocompleteMatch for a navigational suggestion |navigation|.
   AutocompleteMatch NavigationToMatch(const NavigationResult& navigation);
 
   // Fetches zero-suggest suggestions by sending a request using |suggest_url|.
   void Run(const GURL& suggest_url);
 
   // Parses results from the zero-suggest server and updates results.
   void ParseSuggestResults(const base::Value& root_val);
 
   // Converts the parsed results to a set of AutocompleteMatches and adds them
@@ skipping 40 matching lines @@
 
   history::MostVisitedURLList most_visited_urls_;
 
   // For callbacks that may be run after destruction.
   base::WeakPtrFactory<ZeroSuggestProvider> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ZeroSuggestProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_ZERO_SUGGEST_PROVIDER_H_