Add a class to parse answer json.

components/omnibox/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_OMNIBOX_SEARCH_SUGGESTION_PARSER_H_
 #define COMPONENTS_OMNIBOX_SEARCH_SUGGESTION_PARSER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/strings/string16.h"
 #include "components/omnibox/autocomplete_match.h"
 #include "components/omnibox/autocomplete_match_type.h"
+#include "components/omnibox/suggestion_answer.h"
 #include "url/gurl.h"
 
 class AutocompleteInput;
 class AutocompleteSchemeClassifier;
 
 namespace base {
 class DictionaryValue;
 class Value;
 }
 
@@ skipping 85 matching lines @@
 
   class SuggestResult : public Result {
    public:
     SuggestResult(const base::string16& suggestion,
                   AutocompleteMatchType::Type type,
                   const base::string16& match_contents,
                   const base::string16& match_contents_prefix,
                   const base::string16& annotation,
                   const base::string16& answer_contents,
                   const base::string16& answer_type,
+                  const SuggestionAnswer* answer,
                   const std::string& suggest_query_params,
                   const std::string& deletion_url,
                   bool from_keyword_provider,
                   int relevance,
                   bool relevance_from_server,
                   bool should_prefetch,
                   const base::string16& input_text);
+    SuggestResult(const SuggestResult& result);
     ~SuggestResult() override;
 
+    SuggestResult& operator=(const SuggestResult& result);
+
     const base::string16& suggestion() const { return suggestion_; }
     const base::string16& match_contents_prefix() const {
       return match_contents_prefix_;
     }
     const base::string16& annotation() const { return annotation_; }
     const std::string& suggest_query_params() const {
       return suggest_query_params_;
     }
 
     const base::string16& answer_contents() const { return answer_contents_; }
     const base::string16& answer_type() const { return answer_type_; }
+    const SuggestionAnswer* answer() const { return answer_.get(); }
 
     bool should_prefetch() const { return should_prefetch_; }
 
     // Fills in |match_contents_class_| to reflect how |match_contents_| should
     // be displayed and bolded against the current |input_text|.  If
     // |allow_bolding_all| is false and |match_contents_class_| would have all
     // of |match_contents_| bolded, do nothing.
     void ClassifyMatchContents(const bool allow_bolding_all,
                                const base::string16& input_text);
 
@@ skipping 12 matching lines @@
     base::string16 match_contents_prefix_;
 
     // Optional annotation for the |match_contents_| for disambiguation.
     // This may be displayed in the autocomplete match contents, but is defined
     // separately to facilitate different formatting.
     base::string16 annotation_;
 
     // Optional additional parameters to be added to the search URL.
     std::string suggest_query_params_;
 
+    // TODO(jdonnelly): Remove the following two properties once the downstream
+    // clients are using the SuggestionAnswer.
     // Optional formatted Answers result.
     base::string16 answer_contents_;
 
     // Type of optional formatted Answers result.
     base::string16 answer_type_;
 
+    // Optional short answer to the input that produced this suggestion.
+    scoped_ptr<SuggestionAnswer> answer_;
+
     // Should this result be prefetched?
     bool should_prefetch_;
   };
 
   class NavigationResult : public Result {
    public:
     NavigationResult(const AutocompleteSchemeClassifier& scheme_classifier,
                      const GURL& url,
                      AutocompleteMatchType::Type type,
                      const base::string16& description,
@@ skipping 68 matching lines @@
     // 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;
+    SuggestionAnswer::URLs answers_image_urls;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(Results);
   };
 
   // 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,
       int default_result_relevance,
       const std::string& languages,
       bool is_keyword_result,
       Results* results);
 
  private:
-  FRIEND_TEST_ALL_PREFIXES(SearchSuggestionParser,
-                           GetAnswersImageURLsWithoutImagelines);
-  FRIEND_TEST_ALL_PREFIXES(SearchSuggestionParser,
-                           GetAnswersImageURLsWithValidImage);
-
-  // 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_OMNIBOX_SEARCH_SUGGESTION_PARSER_H_