Removing ContentViewCore dependencies from direct WebContents functions.

chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerTest.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.test.suitebuilder.annotation.SmallTest;
 import android.text.TextUtils;
 
 import org.chromium.base.CommandLine;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.UrlUtils;
 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_public.browser.WebContents;
 
 import java.util.concurrent.TimeoutException;
 
 /**
  * Integration tests for the AutofillPopup.
  */
 public class AutofillDialogControllerTest extends ChromeShellTestBase {
     private static final String SWITCH_REDUCE_SECURITY_FOR_TESTING = "reduce-security-for-testing";
     private static final long DIALOG_CALLBACK_DELAY_MILLISECONDS = 50;
 
@@ skipping 500 matching lines @@
                 ? "<input id=\"id-opt-cc-csc\" autocomplete=\"cc-csc\">"
                 : "";
         final String url = UrlUtils.encodeHtmlDataUri(
                 HTML_PRELUDE
                 + htmlFragment
                 + optionalCcFragment
                 + HTML_POSTLUDE);
 
         setUpAndRequestAutocomplete(url, requestFullBilling, requestShipping, requestPhoneNumbers);
 
-        final ContentViewCore viewCore = getActivity().getActiveContentViewCore();
+        final WebContents webContents = getActivity().getActiveContentViewCore().getWebContents();
 
         assertEquals(actualId + " did not match",
-                expected, DOMUtils.getNodeValue(viewCore, actualId));
+                expected, DOMUtils.getNodeValue(webContents, actualId));
         if (requestCcInfo) {
             assertEquals("cc-csc did not match",
-                    TEST_CC_CSC, DOMUtils.getNodeValue(viewCore, "id-opt-cc-csc"));
+                    TEST_CC_CSC, DOMUtils.getNodeValue(webContents, "id-opt-cc-csc"));
         }
     }
 
     private void verifyFieldsAreFilled(final boolean requestFullBilling,
             final boolean requestShipping, final boolean requestPhoneNumbers)
             throws InterruptedException, TimeoutException {
         setUpAndRequestAutocomplete(
                 generatePage(requestFullBilling, requestShipping, requestPhoneNumbers),
                 requestFullBilling, requestShipping, requestPhoneNumbers);
 
-        final ContentViewCore viewCore = getActivity().getActiveContentViewCore();
+        final WebContents webContents = getActivity().getActiveContentViewCore().getWebContents();
 
         assertEquals("billing name did not match",
-                TEST_NAME, DOMUtils.getNodeValue(viewCore, "id-billing-name"));
+                TEST_NAME, DOMUtils.getNodeValue(webContents, "id-billing-name"));
         assertEquals("email did not match",
-                TEST_EMAIL, DOMUtils.getNodeValue(viewCore, "id-email"));
+                TEST_EMAIL, DOMUtils.getNodeValue(webContents, "id-email"));
 
         assertEquals("cc-name did not match",
-                TEST_NAME, DOMUtils.getNodeValue(viewCore, "id-cc-name"));
+                TEST_NAME, DOMUtils.getNodeValue(webContents, "id-cc-name"));
 
         assertEquals("cc-number did not match",
-                TEST_CC_NUMBER, DOMUtils.getNodeValue(viewCore, "id-cc-number"));
+                TEST_CC_NUMBER, DOMUtils.getNodeValue(webContents, "id-cc-number"));
         assertEquals("cc-csc did not match",
-                TEST_CC_CSC, DOMUtils.getNodeValue(viewCore, "id-cc-csc"));
+                TEST_CC_CSC, DOMUtils.getNodeValue(webContents, "id-cc-csc"));
 
         assertEquals("cc-exp did not match",
                 "" + TEST_CC_EXP_YEAR + "-" + TEST_CC_EXP_MONTH,
-                DOMUtils.getNodeValue(viewCore, "id-cc-exp"));
+                DOMUtils.getNodeValue(webContents, "id-cc-exp"));
 
         assertEquals("cc-exp-month did not match",
                 "" + TEST_CC_EXP_MONTH,
-                DOMUtils.getNodeValue(viewCore, "id-cc-exp-month"));
+                DOMUtils.getNodeValue(webContents, "id-cc-exp-month"));
         assertEquals("cc-exp-year did not match",
                 "" + TEST_CC_EXP_YEAR,
-                DOMUtils.getNodeValue(viewCore, "id-cc-exp-year"));
+                DOMUtils.getNodeValue(webContents, "id-cc-exp-year"));
 
         assertEquals("billing postal-code did not match",
-                TEST_BILLING_ZIP, DOMUtils.getNodeValue(viewCore, "id-cc-zip"));
+                TEST_BILLING_ZIP, DOMUtils.getNodeValue(webContents, "id-cc-zip"));
 
         if (requestFullBilling) {
             assertEquals("billing address-line1 did not match",
-                    TEST_BILLING1, DOMUtils.getNodeValue(viewCore, "id-cc-1"));
+                    TEST_BILLING1, DOMUtils.getNodeValue(webContents, "id-cc-1"));
             assertEquals("billing address-line2 did not match",
-                    TEST_BILLING2, DOMUtils.getNodeValue(viewCore, "id-cc-2"));
+                    TEST_BILLING2, DOMUtils.getNodeValue(webContents, "id-cc-2"));
             assertEquals("billing street-address did not match",
-                    TEST_BILLING_STREET, DOMUtils.getNodeValue(viewCore, "id-cc-str"));
+                    TEST_BILLING_STREET, DOMUtils.getNodeValue(webContents, "id-cc-str"));
             assertEquals("billing locality did not match",
-                    TEST_BILLING_CITY, DOMUtils.getNodeValue(viewCore, "id-cc-city"));
+                    TEST_BILLING_CITY, DOMUtils.getNodeValue(webContents, "id-cc-city"));
             assertEquals("billing region did not match",
-                    TEST_BILLING_STATE, DOMUtils.getNodeValue(viewCore, "id-cc-state"));
+                    TEST_BILLING_STATE, DOMUtils.getNodeValue(webContents, "id-cc-state"));
             assertEquals("billing country did not match",
-                    TEST_BILLING_COUNTRY, DOMUtils.getNodeValue(viewCore, "id-cc-country"));
+                    TEST_BILLING_COUNTRY, DOMUtils.getNodeValue(webContents, "id-cc-country"));
 
             if (requestPhoneNumbers) {
                 assertEquals("billing tel did not match",
                         TEST_PHONE_UNFORMATTED,
-                        DOMUtils.getNodeValue(viewCore, "id-cc-tel"));
+                        DOMUtils.getNodeValue(webContents, "id-cc-tel"));
             }
         }
 
         if (requestShipping) {
             assertEquals("shipping name did not match",
-                    TEST_SHIPPING_NAME, DOMUtils.getNodeValue(viewCore, "id-h-name"));
+                    TEST_SHIPPING_NAME, DOMUtils.getNodeValue(webContents, "id-h-name"));
             assertEquals("shipping postal-code did not match",
-                    TEST_SHIPPING_ZIP, DOMUtils.getNodeValue(viewCore, "id-h-zip"));
+                    TEST_SHIPPING_ZIP, DOMUtils.getNodeValue(webContents, "id-h-zip"));
             assertEquals("shipping address-line1 did not match",
-                    TEST_SHIPPING1, DOMUtils.getNodeValue(viewCore, "id-h-1"));
+                    TEST_SHIPPING1, DOMUtils.getNodeValue(webContents, "id-h-1"));
             assertEquals("shipping address-line2 did not match",
-                    TEST_SHIPPING2, DOMUtils.getNodeValue(viewCore, "id-h-2"));
+                    TEST_SHIPPING2, DOMUtils.getNodeValue(webContents, "id-h-2"));
             assertEquals("shipping street-address did not match",
-                    TEST_SHIPPING_STREET, DOMUtils.getNodeValue(viewCore, "id-h-str"));
+                    TEST_SHIPPING_STREET, DOMUtils.getNodeValue(webContents, "id-h-str"));
             assertEquals("shipping locality did not match",
-                    TEST_SHIPPING_CITY, DOMUtils.getNodeValue(viewCore, "id-h-city"));
+                    TEST_SHIPPING_CITY, DOMUtils.getNodeValue(webContents, "id-h-city"));
             assertEquals("shipping region did not match",
-                    TEST_SHIPPING_STATE, DOMUtils.getNodeValue(viewCore, "id-h-state"));
+                    TEST_SHIPPING_STATE, DOMUtils.getNodeValue(webContents, "id-h-state"));
             assertEquals("shipping country did not match",
                     TEST_SHIPPING_COUNTRY,
-                    DOMUtils.getNodeValue(viewCore, "id-h-country"));
+                    DOMUtils.getNodeValue(webContents, "id-h-country"));
 
             // It is currently unspecified whether autocomplete="name" gives a SHIPPING or
             // a BILLING name. I'm assuming here that this is a shipping name.
             assertEquals("name did not match",
-                    TEST_SHIPPING_NAME, DOMUtils.getNodeValue(viewCore, "id-name"));
+                    TEST_SHIPPING_NAME, DOMUtils.getNodeValue(webContents, "id-name"));
 
             if (requestPhoneNumbers) {
                 assertEquals("shipping tel did not match",
                         TEST_SHIPPING_PHONE_UNFORMATTED,
-                        DOMUtils.getNodeValue(viewCore, "id-h-tel"));
+                        DOMUtils.getNodeValue(webContents, "id-h-tel"));
 
                 // It is currently unspecified whether autocomplete="name" gives a SHIPPING or
                 // a BILLING phone. I'm assuming here that this is a shipping phone.
                 assertEquals("tel did not match",
                         TEST_SHIPPING_PHONE_UNFORMATTED,
-                        DOMUtils.getNodeValue(viewCore, "id-tel"));
+                        DOMUtils.getNodeValue(webContents, "id-tel"));
             }
         }
     }
 
     // Wait and assert helper methods -------------------------------------------------------------
 
     private void setUpAndRequestAutocomplete(final String url,
             final boolean requestFullBilling,
             final boolean requestShipping,
             final boolean requestPhoneNumbers) throws InterruptedException, TimeoutException {
@@ skipping 14 matching lines @@
     private void setUpAndRequestAutocompleteImpl(final String url,
             final boolean requestFullBilling,
             final boolean requestShipping,
             final boolean requestPhoneNumbers,
             final boolean expectFailure)
             throws InterruptedException, TimeoutException {
         launchChromeShellWithUrl(url);
         assertTrue(waitForActiveShellToBeDoneLoading());
 
         final ContentViewCore viewCore = getActivity().getActiveContentViewCore();
+        final WebContents webContents = getActivity().getActiveContentViewCore().getWebContents();
 
         AutofillDialogResult.ResultWallet result = new AutofillDialogResult.ResultWallet(
                 TEST_EMAIL, "Google Transaction ID",
                 new AutofillDialogResult.ResultCard(
                         TEST_CC_EXP_MONTH, TEST_CC_EXP_YEAR,
                         TEST_CC_NUMBER, TEST_CC_CSC),
                 new AutofillDialogResult.ResultAddress(
                         TEST_NAME, TEST_PHONE,
                         TEST_BILLING_STREET,
                         TEST_BILLING_CITY, TEST_BILLING_DL, TEST_BILLING_STATE,
                         TEST_BILLING_ZIP, TEST_BILLING_SORTING_CODE, TEST_BILLING_COUNTRY,
                         TEST_BILLING_LANGUAGE),
                 new AutofillDialogResult.ResultAddress(
                         TEST_SHIPPING_NAME, TEST_SHIPPING_PHONE,
                         TEST_SHIPPING_STREET,
                         TEST_SHIPPING_CITY, TEST_SHIPPING_DL, TEST_SHIPPING_STATE,
                         TEST_SHIPPING_ZIP, TEST_SHIPPING_SORTING_CODE, TEST_SHIPPING_COUNTRY,
                         TEST_SHIPPING_LANGUAGE));
         MockAutofillDialogController.installMockFactory(
                 DIALOG_CALLBACK_DELAY_MILLISECONDS,
                 result,
                 true, "", "", "", "",
                 requestFullBilling, requestShipping, requestPhoneNumbers);
 
         DOMUtils.clickNode(this, viewCore, "id-button");
-        waitForInputFieldFill(viewCore);
+        waitForInputFieldFill(webContents);
 
         if (!expectFailure) {
             assertEquals("requestAutocomplete failed",
                     "succeeded",
-                    DOMUtils.getNodeContents(viewCore, "was-autocompleted"));
+                    DOMUtils.getNodeContents(webContents, "was-autocompleted"));
         } else {
             assertEquals("requestAutocomplete succeeded when it should be failing",
                     "failed",
-                    DOMUtils.getNodeContents(viewCore, "was-autocompleted"));
+                    DOMUtils.getNodeContents(webContents, "was-autocompleted"));
         }
     }
 
-    private void waitForInputFieldFill(final ContentViewCore viewCore) throws InterruptedException {
+    private void waitForInputFieldFill(final WebContents webContents) throws InterruptedException {
         assertTrue("requestAutocomplete() never completed.",
                 CriteriaHelper.pollForCriteria(new Criteria() {
                     @Override
                     public boolean isSatisfied() {
                         String wasAutocompleted;
                         try {
                             wasAutocompleted = DOMUtils.getNodeContents(
-                                    viewCore, "was-autocompleted");
+                                    webContents, "was-autocompleted");
                         } catch (InterruptedException e) {
                             return false;
                         } catch (TimeoutException e) {
                             return false;
                         }
                         return TextUtils.equals("succeeded", wasAutocompleted)
                                 || TextUtils.equals("failed", wasAutocompleted);
                     }
                 }));
     }
 }