Part 1 of search provider refactoring.

chrome/browser/autocomplete/zero_suggest_provider.h

Index: chrome/browser/autocomplete/zero_suggest_provider.h
diff --git a/chrome/browser/autocomplete/zero_suggest_provider.h b/chrome/browser/autocomplete/zero_suggest_provider.h
index 41d6b04cc9d1aed44240e7f0910128931e1dfc4d..873749cf5f9ff7be20de43bc71d9fb8ccf8b9cb9 100644
--- a/chrome/browser/autocomplete/zero_suggest_provider.h
+++ b/chrome/browser/autocomplete/zero_suggest_provider.h
@@ -22,7 +22,8 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
-#include "chrome/browser/autocomplete/autocomplete_provider.h"
+#include "chrome/browser/autocomplete/autocomplete_provider_listener.h"

[msw, 2014/02/03 22:53:14]

nit: remove redundant includes like this.

[Maria, 2014/02/04 03:16:39]

Done.

+#include "chrome/browser/autocomplete/base_search_provider.h"
 #include "chrome/browser/autocomplete/search_provider.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
@@ -49,8 +50,7 @@ class URLFetcher;
 // TODO(jered): Consider deleting this class and building this functionality
 // into SearchProvider after dogfood and after we break the association between
 // omnibox text and suggestions.
-class ZeroSuggestProvider : public AutocompleteProvider,
-                            public net::URLFetcherDelegate {
+class ZeroSuggestProvider : public BaseSearchProvider {
  public:
   // Creates and returns an instance of this provider.
   static ZeroSuggestProvider* Create(AutocompleteProviderListener* listener,
@@ -99,14 +99,14 @@ class ZeroSuggestProvider : public AutocompleteProvider,
   // |verbatim_relevance|.
   void FillResults(const base::Value& root_val,
                    int* verbatim_relevance,
-                   SearchProvider::SuggestResults* suggest_results,
-                   SearchProvider::NavigationResults* navigation_results);
+                   SuggestResults* suggest_results,
+                   NavigationResults* navigation_results);
 
   // Creates AutocompleteMatches to search |template_url| for "<suggestion>" for
   // all suggestions in |results|, and adds them to |map|.
-  void AddSuggestResultsToMap(const SearchProvider::SuggestResults& results,
+  void AddSuggestResultsToMap(const SuggestResults& results,
                               const TemplateURL* template_url,
-                              SearchProvider::MatchMap* map);
+                              MatchMap* map);
 
   // Creates an AutocompleteMatch with the provided |relevance| and |type| to
   // search |template_url| for |query_string|.  |accepted_suggestion| will be
@@ -119,11 +119,10 @@ class ZeroSuggestProvider : public AutocompleteProvider,
                      const TemplateURL* template_url,
                      const base::string16& query_string,
                      int accepted_suggestion,
-                     SearchProvider::MatchMap* map);
+                     MatchMap* map);
 
   // Returns an AutocompleteMatch for a navigational suggestion |navigation|.
-  AutocompleteMatch NavigationToMatch(
-      const SearchProvider::NavigationResult& navigation);
+  AutocompleteMatch NavigationToMatch(const NavigationResult& navigation);
 
   // Fetches zero-suggest suggestions by sending a request using |suggest_url|.
   void Run(const GURL& suggest_url);
@@ -167,9 +166,9 @@ class ZeroSuggestProvider : public AutocompleteProvider,
   // Suggestion for the current URL.
   AutocompleteMatch current_url_match_;
   // Navigation suggestions for the most recent ZeroSuggest input URL.
-  SearchProvider::NavigationResults navigation_results_;
+  NavigationResults navigation_results_;
   // Query suggestions for the most recent ZeroSuggest input URL.
-  SearchProvider::MatchMap query_matches_map_;
+  MatchMap query_matches_map_;
   // The relevance score for the URL of the current page.
   int verbatim_relevance_;