Cleaning up Android's Autofill call suggestionSelected.

chrome/android/javatests/src/org/chromium/chrome/browser/test/AutofillTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/test/AutofillTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/test/AutofillTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/test/AutofillTest.java
index 4ba21e72bb30ad1bcb5152d0e904bdd9f57e4c7e..10e82c6a92c44689dc7aabf2bae2b97acbafce3e 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/test/AutofillTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/test/AutofillTest.java
@@ -76,19 +76,15 @@ public class AutofillTest extends ChromiumTestShellTestBase {
         private static final int CALLBACK_TIMEOUT_MS = 4000;
         private static final int CHECK_INTERVAL_MS = 100;
         private final AtomicBoolean mGotPopupSelection = new AtomicBoolean(false);
-        private Pair<String, Integer> mSelectedData = null;
+        public int mListIndex = -1;
 
         @Override
-        public void suggestionSelected(int listIndex, String value, int uniqueId) {
-            mSelectedData = new Pair<String, Integer>(value, uniqueId);
+        public void suggestionSelected(int listIndex) {
+            mListIndex = listIndex;
             mAutofillPopup.dismiss();
             mGotPopupSelection.set(true);
         }
 
-        public Pair<String, Integer> getSelectedData() {
-            return mSelectedData;
-        }
-
         public boolean waitForCallback() throws InterruptedException {
             return CriteriaHelper.pollForCriteria(new Criteria() {
                 @Override
@@ -157,8 +153,6 @@ public class AutofillTest extends ChromiumTestShellTestBase {
         touchCommon.singleClickViewRelative(mAutofillPopup.getListView(), 10, 10);
         assertTrue(mMockAutofillCallback.waitForCallback());
 
-        Pair<String, Integer> selected = mMockAutofillCallback.getSelectedData();
-        assertEquals(suggestions[0].mName, selected.first);
-        assertEquals(suggestions[0].mUniqueId, selected.second.intValue());
+        assertEquals(0, mMockAutofillCallback.mListIndex);
     }
 }