Removing ContentViewCore dependencies from direct WebContents functions.

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

 // Copyright 2013 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.autofill;
 
 import android.test.suitebuilder.annotation.MediumTest;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
 import org.chromium.chrome.shell.ChromeShellTestBase;
 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.TestInputMethodManagerWrapper;
 import org.chromium.content.browser.test.util.TouchCommon;
+import org.chromium.content_public.browser.WebContents;
 import org.chromium.ui.autofill.AutofillPopup;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 
 /**
  * Integration tests for the AutofillPopup.
  */
@@ skipping 100 matching lines @@
     private void loadAndFillForm(
             final String formDataUrl, final String inputText)
             throws InterruptedException, ExecutionException, TimeoutException {
         launchChromeShellWithUrl(formDataUrl);
         assertTrue(waitForActiveShellToBeDoneLoading());
         mHelper = new AutofillTestHelper();
 
         // The TestInputMethodManagerWrapper intercepts showSoftInput so that a keyboard is never
         // brought up.
         final ContentViewCore viewCore = getActivity().getActiveContentViewCore();
+        final WebContents webContents = viewCore.getWebContents();
         final ViewGroup view = viewCore.getContainerView();
         final TestInputMethodManagerWrapper immw =
                 new TestInputMethodManagerWrapper(viewCore);
         viewCore.getImeAdapterForTest().setInputMethodManagerWrapper(immw);
 
         // Add an Autofill profile.
         AutofillProfile profile = new AutofillProfile(
                 "" /* guid */, ORIGIN, FIRST_NAME + " " + LAST_NAME, COMPANY_NAME,
                 STREET_ADDRESS_TEXTAREA,
                 STATE, CITY, DEPENDENT_LOCALITY,
                 ZIP_CODE, SORTING_CODE, COUNTRY, PHONE_NUMBER, EMAIL,
                 LANGUAGE_CODE);
         mHelper.setProfile(profile);
         assertEquals(1, mHelper.getNumberOfProfiles());
 
         // Click the input field for the first name.
-        assertTrue(DOMUtils.waitForNonZeroNodeBounds(viewCore, "fn"));
+        assertTrue(DOMUtils.waitForNonZeroNodeBounds(webContents, "fn"));
         DOMUtils.clickNode(this, viewCore, "fn");
 
         waitForKeyboardShowRequest(immw, 1);
 
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 viewCore.getInputConnectionForTest().setComposingText(
                         inputText, 1);
             }
         });
 
         waitForAnchorViewAdd(view);
         View anchorView = view.findViewById(R.id.dropdown_popup_window);
 
         assertTrue(anchorView.getTag() instanceof AutofillPopup);
         final AutofillPopup popup = (AutofillPopup) anchorView.getTag();
 
         waitForAutofillPopopShow(popup);
 
         TouchCommon touchCommon = new TouchCommon(this);
         touchCommon.singleClickViewRelative(popup.getListView(), 10, 10);
 
-        waitForInputFieldFill(viewCore);
+        waitForInputFieldFill(webContents);
     }
 
     /**
      * Tests that bringing up an Autofill and clicking on the first entry fills out the expected
      * Autofill information.
      */
     @MediumTest
     @Feature({"autofill"})
     public void testClickAutofillPopupSuggestion()
             throws InterruptedException, ExecutionException, TimeoutException {
         loadAndFillForm(BASIC_PAGE_DATA, "J");
         final ContentViewCore viewCore = getActivity().getActiveContentViewCore();
+        final WebContents webContents = viewCore.getWebContents();
 
         assertEquals("First name did not match",
-                FIRST_NAME, DOMUtils.getNodeValue(viewCore, "fn"));
+                FIRST_NAME, DOMUtils.getNodeValue(webContents, "fn"));
         assertEquals("Last name did not match",
-                LAST_NAME, DOMUtils.getNodeValue(viewCore, "ln"));
+                LAST_NAME, DOMUtils.getNodeValue(webContents, "ln"));
         assertEquals("Street address (textarea) did not match",
-                STREET_ADDRESS_TEXTAREA, DOMUtils.getNodeValue(viewCore, "sa"));
+                STREET_ADDRESS_TEXTAREA, DOMUtils.getNodeValue(webContents, "sa"));
         assertEquals("Address line 1 did not match",
-                ADDRESS_LINE1, DOMUtils.getNodeValue(viewCore, "a1"));
+                ADDRESS_LINE1, DOMUtils.getNodeValue(webContents, "a1"));
         assertEquals("Address line 2 did not match",
-                ADDRESS_LINE2, DOMUtils.getNodeValue(viewCore, "a2"));
+                ADDRESS_LINE2, DOMUtils.getNodeValue(webContents, "a2"));
         assertEquals("City did not match",
-                CITY, DOMUtils.getNodeValue(viewCore, "ct"));
+                CITY, DOMUtils.getNodeValue(webContents, "ct"));
         assertEquals("Zip code did not match",
-                ZIP_CODE, DOMUtils.getNodeValue(viewCore, "zc"));
+                ZIP_CODE, DOMUtils.getNodeValue(webContents, "zc"));
         assertEquals("Country did not match",
-                COUNTRY, DOMUtils.getNodeValue(viewCore, "co"));
+                COUNTRY, DOMUtils.getNodeValue(webContents, "co"));
         assertEquals("Email did not match",
-                EMAIL, DOMUtils.getNodeValue(viewCore, "em"));
+                EMAIL, DOMUtils.getNodeValue(webContents, "em"));
         assertEquals("Phone number did not match",
-                PHONE_NUMBER, DOMUtils.getNodeValue(viewCore, "ph"));
+                PHONE_NUMBER, DOMUtils.getNodeValue(webContents, "ph"));
 
         final String profileFullName = FIRST_NAME + " " + LAST_NAME;
         final int loggedEntries = 10;
         assertEquals("Mismatched number of logged entries",
                 loggedEntries, mAutofillLoggedEntries.size());
         assertLogged(FIRST_NAME, profileFullName);
         assertLogged(LAST_NAME, profileFullName);
         assertLogged(STREET_ADDRESS_TEXTAREA, profileFullName);
         assertLogged(ADDRESS_LINE1, profileFullName);
         assertLogged(ADDRESS_LINE2, profileFullName);
@@ skipping 86 matching lines @@
     private void waitForAutofillPopopShow(final AutofillPopup popup) throws InterruptedException {
         assertTrue("Autofill Popup anchor view was never added.",
                 CriteriaHelper.pollForCriteria(new Criteria() {
                     @Override
                     public boolean isSatisfied() {
                         return popup.isShowing();
                     }
                 }));
     }
 
-    private void waitForInputFieldFill(final ContentViewCore viewCore) throws InterruptedException {
+    private void waitForInputFieldFill(final WebContents webContents) 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, "fn"));
+                                    DOMUtils.getNodeValue(webContents, "fn"));
                         } catch (InterruptedException e) {
                             return false;
                         } catch (TimeoutException e) {
                             return false;
                         }
 
                     }
                 }));
     }
 
     private void assertLogged(String autofilledValue, String profileFullName) {
         for (AutofillLogger.LogEntry entry : mAutofillLoggedEntries) {
             if (entry.getAutofilledValue().equals(autofilledValue) &&
                 entry.getProfileFullName().equals(profileFullName)) {
                 return;
             }
         }
         fail("Logged entry not found [" + autofilledValue + "," + profileFullName + "]");
     }
 }