Remove some dependencies on ContentView.

chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupTest.java
index 35d80029a09616999ab07610d4a101b779823a4e..6f60737d1ef46914308166799dda88a814898464 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupTest.java
@@ -19,7 +19,6 @@ import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.DOMUtils;
-import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
 import org.chromium.content.browser.test.util.TestInputMethodManagerWrapper;
 import org.chromium.content.browser.test.util.TouchCommon;
 import org.chromium.ui.autofill.AutofillPopup;
@@ -127,7 +126,7 @@ public class AutofillPopupTest extends ChromeShellTestBase {
         );
     }
 
-    private TestCallbackHelperContainer loadAndFillForm(
+    private void loadAndFillForm(
             final String formDataUrl, final String inputText)
             throws InterruptedException, ExecutionException, TimeoutException {
         launchChromeShellWithUrl(formDataUrl);
@@ -150,9 +149,8 @@ public class AutofillPopupTest extends ChromeShellTestBase {
         assertEquals(1, mHelper.getNumberOfProfiles());
 
         // Click the input field for the first name.
-        final TestCallbackHelperContainer viewClient = new TestCallbackHelperContainer(view);
-        assertTrue(DOMUtils.waitForNonZeroNodeBounds(viewCore, viewClient, "fn"));
-        DOMUtils.clickNode(this, view, viewClient, "fn");
+        assertTrue(DOMUtils.waitForNonZeroNodeBounds(viewCore, "fn"));
+        DOMUtils.clickNode(this, view, "fn");
 
         waitForKeyboardShowRequest(immw, 1);
 
@@ -175,9 +173,7 @@ public class AutofillPopupTest extends ChromeShellTestBase {
         TouchCommon touchCommon = new TouchCommon(this);
         touchCommon.singleClickViewRelative(popup.getListView(), 10, 10);
 
-        waitForInputFieldFill(viewCore, viewClient);
-
-        return viewClient;
+        waitForInputFieldFill(viewCore);
     }
 
     /**
@@ -188,27 +184,27 @@ public class AutofillPopupTest extends ChromeShellTestBase {
     @Feature({"autofill"})
     public void testClickAutofillPopupSuggestion()
             throws InterruptedException, ExecutionException, TimeoutException {
-        TestCallbackHelperContainer viewClient = loadAndFillForm(BASIC_PAGE_DATA, "J");
+        loadAndFillForm(BASIC_PAGE_DATA, "J");
         final ContentViewCore viewCore = getActivity().getActiveContentView().getContentViewCore();
 
         assertEquals("First name did not match",
-                FIRST_NAME, DOMUtils.getNodeValue(viewCore, viewClient, "fn"));
+                FIRST_NAME, DOMUtils.getNodeValue(viewCore, "fn"));
         assertEquals("Last name did not match",
-                LAST_NAME, DOMUtils.getNodeValue(viewCore, viewClient, "ln"));
+                LAST_NAME, DOMUtils.getNodeValue(viewCore, "ln"));
         assertEquals("Address line 1 did not match",
-                ADDRESS_LINE1, DOMUtils.getNodeValue(viewCore, viewClient, "a1"));
+                ADDRESS_LINE1, DOMUtils.getNodeValue(viewCore, "a1"));
         assertEquals("Address line 2 did not match",
-                ADDRESS_LINE2, DOMUtils.getNodeValue(viewCore, viewClient, "a2"));
+                ADDRESS_LINE2, DOMUtils.getNodeValue(viewCore, "a2"));
         assertEquals("City did not match",
-                CITY, DOMUtils.getNodeValue(viewCore, viewClient, "ct"));
+                CITY, DOMUtils.getNodeValue(viewCore, "ct"));
         assertEquals("Zip code did not match",
-                ZIP_CODE, DOMUtils.getNodeValue(viewCore, viewClient, "zc"));
+                ZIP_CODE, DOMUtils.getNodeValue(viewCore, "zc"));
         assertEquals("Country did not match",
-                COUNTRY, DOMUtils.getNodeValue(viewCore, viewClient, "co"));
+                COUNTRY, DOMUtils.getNodeValue(viewCore, "co"));
         assertEquals("Email did not match",
-                EMAIL, DOMUtils.getNodeValue(viewCore, viewClient, "em"));
+                EMAIL, DOMUtils.getNodeValue(viewCore, "em"));
         assertEquals("Phone number did not match",
-                PHONE_NUMBER, DOMUtils.getNodeValue(viewCore, viewClient, "ph"));
+                PHONE_NUMBER, DOMUtils.getNodeValue(viewCore, "ph"));
 
         final String profileFullName = FIRST_NAME + " " + LAST_NAME;
         final int loggedEntries = 9;
@@ -314,15 +310,14 @@ public class AutofillPopupTest extends ChromeShellTestBase {
                 }));
     }
 
-    private void waitForInputFieldFill(final ContentViewCore viewCore,
-            final TestCallbackHelperContainer viewClient) throws InterruptedException {
+    private void waitForInputFieldFill(final ContentViewCore viewCore) throws InterruptedException {
         assertTrue("First name field was never filled.",
                 CriteriaHelper.pollForCriteria(new Criteria() {
                     @Override
                     public boolean isSatisfied() {
                         try {
                             return TextUtils.equals(FIRST_NAME,
-                                    DOMUtils.getNodeValue(viewCore, viewClient, "fn"));
+                                    DOMUtils.getNodeValue(viewCore, "fn"));
                         } catch (InterruptedException e) {
                             return false;
                         } catch (TimeoutException e) {