[AiS] Extract Answers, store on AutocompleteMatch.

chrome/browser/autocomplete/base_search_provider.h

Index: chrome/browser/autocomplete/base_search_provider.h
diff --git a/chrome/browser/autocomplete/base_search_provider.h b/chrome/browser/autocomplete/base_search_provider.h
index d21defb3604b0976b4eff6d7678c635735ad850d..33ea124aa6ad84d5f106151872580995fc870139 100644
--- a/chrome/browser/autocomplete/base_search_provider.h
+++ b/chrome/browser/autocomplete/base_search_provider.h
@@ -177,6 +177,8 @@ class BaseSearchProvider : public AutocompleteProvider,
                   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 std::string& suggest_query_params,
                   const std::string& deletion_url,
                   bool from_keyword_provider,
@@ -194,6 +196,10 @@ class BaseSearchProvider : public AutocompleteProvider,
     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_; }
+
     bool should_prefetch() const { return should_prefetch_; }
 
     // Fills in |match_contents_class_| to reflect how |match_contents_| should
@@ -227,6 +233,12 @@ class BaseSearchProvider : public AutocompleteProvider,
     // Optional additional parameters to be added to the search URL.
     std::string suggest_query_params_;
 
+    // Optional formatted Answers result.
+    base::string16 answer_contents_;
+
+    // Type of optional formatted Answers result.
+    base::string16 answer_type_;
+
     // Should this result be prefetched?
     bool should_prefetch_;
   };