Move DeserializeJsonData() and UTF-8 conversion code to SearchSuggestionParser

chrome/browser/autocomplete/base_search_provider.h

 // Copyright 2014 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 class contains common functionality for search-based autocomplete
 // providers. Search provider and zero suggest provider both use it for common
 // functionality.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_BASE_SEARCH_PROVIDER_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_BASE_SEARCH_PROVIDER_H_
@@ skipping 109 matching lines @@
   // command-line-specified query params.
   static AutocompleteMatch CreateSearchSuggestion(
       AutocompleteProvider* autocomplete_provider,
       const AutocompleteInput& input,
       const SearchSuggestionParser::SuggestResult& suggestion,
       const TemplateURL* template_url,
       const SearchTermsData& search_terms_data,
       int accepted_suggestion,
       bool append_extra_query_params);
 
-  // Parses JSON response received from the provider, stripping XSSI
-  // protection if needed. Returns the parsed data if successful, NULL
-  // otherwise.
-  static scoped_ptr<base::Value> DeserializeJsonData(std::string json_data);
-
   // Returns whether the requirements for requesting zero suggest results
   // are met. The requirements are
   // * The user is enrolled in a zero suggest experiment.
   // * The user is not on the NTP.
   // * The suggest request is sent over HTTPS.  This avoids leaking the current
   //   page URL or personal data in unencrypted network traffic.
   // * The user has suggest enabled in their settings and is not in incognito
   //   mode.  (Incognito disables suggest entirely.)
   // * The user's suggest provider is Google.  We might want to allow other
   //   providers to see this data someday, but for now this has only been
@@ skipping 52 matching lines @@
   // Parses results from the suggest server and updates the appropriate suggest
   // and navigation result lists in |results|. |is_keyword_result| indicates
   // whether the response was received from the keyword provider.
   // Returns whether the appropriate result list members were updated.
   bool ParseSuggestResults(const base::Value& root_val,
                            bool is_keyword_result,
                            SearchSuggestionParser::Results* results);
 
   // Called at the end of ParseSuggestResults to rank the |results|.
   virtual void SortResults(bool is_keyword,
-                           bool relevances_from_server,
                            SearchSuggestionParser::Results* results);
 
   // Optionally, cache the received |json_data| and return true if we want
   // to stop processing results at this point. The |parsed_data| is the parsed
   // version of |json_data| used to determine if we received an empty result.
   virtual bool StoreSuggestionResponse(const std::string& json_data,
                                        const base::Value& parsed_data);
 
   // Returns the TemplateURL corresponding to the keyword or default
   // provider based on the value of |is_keyword|.
@@ skipping 71 matching lines @@
 
   // Each deletion handler in this vector corresponds to an outstanding request
   // that a server delete a personalized suggestion. Making this a ScopedVector
   // causes us to auto-cancel all such requests on shutdown.
   SuggestionDeletionHandlers deletion_handlers_;
 
   DISALLOW_COPY_AND_ASSIGN(BaseSearchProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_BASE_SEARCH_PROVIDER_H_