[AiS] Bring Answers from C++ to Java.

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 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 49 matching lines @@
 
         /**
          * @return The ID of the type used by the native code.
          */
         public int nativeType() {
             return mNativeType;
         }
     }
 
     public OmniboxSuggestion(int nativeType, int relevance, int transition,
-            String text, String description, String fillIntoEdit, String url,
+            String text, String description, String answerContents,
+            String answerType, String fillIntoEdit, String url,
             String formattedUrl, boolean isStarred, boolean isDeletable) {
         mType = Type.getTypeFromNativeType(nativeType);
         mRelevance = relevance;
         mTransition = transition;
         mDisplayText = text;
         mDescription = description;
+        mAnswerContents = answerContents;
+        mAnswerType = answerType;
         mFillIntoEdit = TextUtils.isEmpty(fillIntoEdit) ? text : fillIntoEdit;
         mUrl = url;
         mFormattedUrl = formattedUrl;
         mIsStarred = isStarred;
         mIsDeletable = isDeletable;
     }
 
+    public OmniboxSuggestion(int nativeType, int relevance, int transition,
+            String text, String description, String fillIntoEdit, String url,
+            String formattedUrl, boolean isStarred, boolean isDeletable) {

[Maria, 2014/05/20 01:05:00]

Please delete this constructor after after submitting this change and updating
clank callers to use the one above. I would like to make sure we don't have a
proliferation of constructors for this.

[groby-ooo-7-16, 2014/05/20 22:32:14]

That was the plan. Filed crbug/375482 to track, added comment.

+        this(nativeType, relevance, transition, text, description, null, null, fillIntoEdit, url,
+            formattedUrl, isStarred, isDeletable);
+    }
+
     public Type getType() {
         return mType;
     }
 
     public int getTransition() {
         return mTransition;
     }
 
     public String getDisplayText() {
         return mDisplayText;
     }
 
     public String getDescription() {
         return mDescription;
     }
 
+    public String getAnswerContents() {
+        return mAnswerContents;
+    }
+
+    public String getAnswerType() {
+        return mAnswerType;
+    }
+
     public String getFillIntoEdit() {
         return mFillIntoEdit;
     }
 
     public String getUrl() {
         return mUrl;
     }
 
     public String getFormattedUrl() {
         return mFormattedUrl;
@@ skipping 14 matching lines @@
         return mIsDeletable;
     }
 
     @Override
     public String toString() {
         return mType + " relevance=" +  mRelevance + " \"" + mDisplayText + "\" -> " + mUrl;
     }
 
     @Override
     public int hashCode() {
-        return 37 * mType.mNativeType + mDisplayText.hashCode() + mFillIntoEdit.hashCode() +
+        int hash = 37 * mType.mNativeType + mDisplayText.hashCode() + mFillIntoEdit.hashCode() +
                 (mIsStarred ? 1 : 0) + (mIsDeletable ? 1 : 0);
+        if (mAnswerContents != null)
+            hash = hash + mAnswerContents.hashCode();

[David Trainor- moved to gerrit, 2014/05/20 18:13:56]

{} around if block or put on same line.

[groby-ooo-7-16, 2014/05/20 22:32:14]

Done.

+        return hash;
     }
 
     @Override
     public boolean equals(Object obj) {
         if (!(obj instanceof OmniboxSuggestion)) {
             return false;
         }
 
         OmniboxSuggestion suggestion = (OmniboxSuggestion) obj;
+
+        boolean answersAreEqual =
+                (mAnswerContents == null && suggestion.mAnswerContents == null) ||
+                (mAnswerContents != null &&
+                 suggestion.mAnswerContents != null &&
+                 mAnswerContents.equals(suggestion.mAnswerContents));
         return mType == suggestion.mType
                 && mFillIntoEdit.equals(suggestion.mFillIntoEdit)
                 && mDisplayText.equals(suggestion.mDisplayText)
+                && answersAreEqual
+                && mAnswerContents.equals(suggestion.mAnswerContents)

[Maria, 2014/05/20 01:05:00]

this line seems unnecessary since we already check that in answersAreEqual

[groby-ooo-7-16, 2014/05/20 22:32:14]

Forgot to delete - thanks for catching!

                 && mIsStarred == suggestion.mIsStarred
                 && mIsDeletable == suggestion.mIsDeletable;
     }
 }