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

components/autocomplete/search_suggestion_parser.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.
 
 #ifndef COMPONENTS_AUTOCOMPLETE_SEARCH_SUGGESTION_PARSER_H_
 #define COMPONENTS_AUTOCOMPLETE_SEARCH_SUGGESTION_PARSER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/callback_forward.h"
 #include "base/strings/string16.h"
 #include "components/autocomplete/autocomplete_match.h"
 #include "components/autocomplete/autocomplete_match_type.h"
 #include "url/gurl.h"
 
 class AutocompleteInput;
 class AutocompleteSchemeClassifier;
 
 namespace base {
 class DictionaryValue;
 class Value;
 }
 
+namespace net {
+class URLFetcher;
+}
+
 class SearchSuggestionParser {
  public:
   // The Result classes are intermediate representations of AutocompleteMatches,
   // simply containing relevance-ranked search and navigation suggestions.
   // They may be cached to provide some synchronous matches while requests for
   // new suggestions from updated input are in flight.
   // TODO(msw) Extend these classes to generate their corresponding matches and
   //           other requisite data, in order to consolidate and simplify the
   //           highly fragmented SearchProvider logic for each Result type.
   class Result {
@@ skipping 203 matching lines @@
     // indicate that there is no suggested score; a value of 0
     // suppresses the verbatim result.
     int verbatim_relevance;
 
     // The JSON metadata associated with this server response.
     std::string metadata;
 
     // If the active suggest field trial (if any) has triggered.
     bool field_trial_triggered;
 
+    // If the relevance values of the results are from the server.
+    bool relevances_from_server;
+
+    // URLs of any images in Answers results.
+    std::vector<GURL> answers_image_urls;
+
    private:
     DISALLOW_COPY_AND_ASSIGN(Results);
   };
 
-  typedef base::Callback<void(const GURL& image_url)> ImagePrefetchCallback;
+  // Extracts JSON data fetched by |source| and converts it to UTF-8.
+  static std::string ExtractJsonData(const net::URLFetcher* source);
+
+  // 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);
 
   // 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.
   static bool ParseSuggestResults(
       const base::Value& root_val,
       const AutocompleteInput& input,
       const AutocompleteSchemeClassifier& scheme_classifier,
-      const ImagePrefetchCallback& image_prefetch_callback,
       int default_result_relevance,
       const std::string& languages,
       bool is_keyword_result,
-      bool* relevances_from_server,
       Results* results);
 
  private:
-  // Prefetches any images in Answers results.
-  static void PrefetchAnswersImages(
-      const base::DictionaryValue* answer_json,
-      const ImagePrefetchCallback& image_prefetch_callback);
+  // Gets URLs of any images in Answers results.
+  static void GetAnswersImageURLs(const base::DictionaryValue* answer_json,
+                                  std::vector<GURL>* urls);
 
   DISALLOW_COPY_AND_ASSIGN(SearchSuggestionParser);
 };
 
 #endif  // COMPONENTS_AUTOCOMPLETE_SEARCH_SUGGESTION_PARSER_H_