[AiS] Add a structured representation of Answer JSON.

chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxSuggestion.java

 // 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.
 
 package org.chromium.chrome.browser.omnibox;
 
 import android.text.TextUtils;
 
 import com.google.common.annotations.VisibleForTesting;
 
 /**
  * Container class with information about each omnibox suggestion item.
  */
 @VisibleForTesting
 public class OmniboxSuggestion {
 
     private final Type mType;
     private final String mDisplayText;
     private final String mDescription;
     private final String mAnswerContents;
     private final String mAnswerType;
+    private final SuggestionAnswer mAnswer;
     private final String mFillIntoEdit;
     private final String mUrl;
     private final String mFormattedUrl;
     private final int mRelevance;
     private final int mTransition;
     private final boolean mIsStarred;
     private final boolean mIsDeletable;
 
     /**
      * This should be kept in sync with AutocompleteMatch::Type
@@ skipping 65 matching lines @@
         mTransition = transition;
         mDisplayText = text;
         mDescription = description;
         mAnswerContents = answerContents;
         mAnswerType = answerType;
         mFillIntoEdit = TextUtils.isEmpty(fillIntoEdit) ? text : fillIntoEdit;
         mUrl = url;
         mFormattedUrl = formattedUrl;
         mIsStarred = isStarred;
         mIsDeletable = isDeletable;
+
+        if (!TextUtils.isEmpty(mAnswerContents)) {
+            // If any errors are encountered parsing the answer contents, this will return null and
+            // hasAnswer will return false, just as if there were no answer contents at all.
+            mAnswer = SuggestionAnswer.parseAnswerContents(mAnswerContents);
+        } else {
+            mAnswer = null;
+        }
     }
 
     /* TODO(groby): Remove - see http://crbug.com/375482 */
     public OmniboxSuggestion(int nativeType, int relevance, int transition,
             String text, String description, String fillIntoEdit, String url,
             String formattedUrl, boolean isStarred, boolean isDeletable) {
         this(nativeType, relevance, transition, text, description, null, null, fillIntoEdit, url,
             formattedUrl, isStarred, isDeletable);
     }
 
@@ skipping 14 matching lines @@
     }
 
     public String getAnswerContents() {
         return mAnswerContents;
     }
 
     public String getAnswerType() {
         return mAnswerType;
     }
 
+    public SuggestionAnswer getAnswer() {
+        return mAnswer;
+    }
+
+    public boolean hasAnswer() {
+        return mAnswer != null;
+    }
+
     public String getFillIntoEdit() {
         return mFillIntoEdit;
     }
 
     public String getUrl() {
         return mUrl;
     }
 
     public String getFormattedUrl() {
         return mFormattedUrl;
@@ skipping 43 matching lines @@
                  suggestion.mAnswerContents != null &&
                  mAnswerContents.equals(suggestion.mAnswerContents));
         return mType == suggestion.mType
                 && mFillIntoEdit.equals(suggestion.mFillIntoEdit)
                 && mDisplayText.equals(suggestion.mDisplayText)
                 && answersAreEqual
                 && mIsStarred == suggestion.mIsStarred
                 && mIsDeletable == suggestion.mIsDeletable;
     }
 }