Revert of Credit card editor for PaymentRequest UI.

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java

 // Copyright 2016 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.payments;
 
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.Spinner;
 import android.widget.TextView;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeSwitches;
@@ skipping 30 matching lines @@
     protected final PaymentsCallbackHelper<PaymentRequestUI> mReadyToClose;
     protected final PaymentsCallbackHelper<PaymentRequestUI> mResultReady;
     protected final PaymentsCallbackHelper<CardUnmaskPrompt> mReadyForUnmaskInput;
     protected final PaymentsCallbackHelper<CardUnmaskPrompt> mReadyToUnmask;
     protected final CallbackHelper mReadyToEdit;
     protected final CallbackHelper mEditorValidationError;
     protected final CallbackHelper mEditorTextUpdate;
     protected final CallbackHelper mEditorDismissed;
     protected final CallbackHelper mDismissed;
     protected final CallbackHelper mUnableToAbort;
-    protected final CallbackHelper mBillingAddressChangeProcessed;
     private final AtomicReference<ContentViewCore> mViewCoreRef;
     private final AtomicReference<WebContents> mWebContentsRef;
     private final String mTestFilePath;
     private PaymentRequestUI mUI;
     private CardUnmaskPrompt mCardUnmaskPrompt;
 
     protected PaymentRequestTestBase(String testFileName) {
         super(ChromeActivity.class);
         mReadyForInput = new PaymentsCallbackHelper<>();
         mReadyToPay = new PaymentsCallbackHelper<>();
         mReadyToClose = new PaymentsCallbackHelper<>();
         mResultReady = new PaymentsCallbackHelper<>();
         mReadyForUnmaskInput = new PaymentsCallbackHelper<>();
         mReadyToUnmask = new PaymentsCallbackHelper<>();
         mReadyToEdit = new CallbackHelper();
         mEditorValidationError = new CallbackHelper();
         mEditorTextUpdate = new CallbackHelper();
         mEditorDismissed = new CallbackHelper();
         mDismissed = new CallbackHelper();
         mUnableToAbort = new CallbackHelper();
-        mBillingAddressChangeProcessed = new CallbackHelper();
         mViewCoreRef = new AtomicReference<>();
         mWebContentsRef = new AtomicReference<>();
         mTestFilePath = UrlUtils.getIsolatedTestFilePath(
                 String.format("chrome/test/data/android/payments/%s", testFileName));
     }
 
     @Override
     public void startMainActivity() throws InterruptedException {}
 
     protected abstract void onMainActivityStarted()
@@ skipping 62 matching lines @@
         int callCount = helper.getCallCount();
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 mUI.getShippingAddressSectionForTest().findViewById(resourceId).performClick();
             }
         });
         helper.waitForCallback(callCount);
     }
 
-    /** Clicks on an element in the "Payment" section of the payments UI. */
-    protected void clickInPaymentMethodAndWait(final int resourceId, CallbackHelper helper)
-            throws InterruptedException, TimeoutException {
-        int callCount = helper.getCallCount();
-        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
-            @Override
-            public void run() {
-                mUI.getPaymentMethodSectionForTest().findViewById(resourceId).performClick();
-            }
-        });
-        helper.waitForCallback(callCount);
-    }
-
     /** Clicks on an element in the "Contact Info" section of the payments UI. */
     protected void clickInContactInfoAndWait(final int resourceId, CallbackHelper helper)
             throws InterruptedException, TimeoutException {
         int callCount = helper.getCallCount();
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 mUI.getContactDetailsSectionForTest().findViewById(resourceId).performClick();
             }
         });
         helper.waitForCallback(callCount);
-    }
-
-    /** Clicks on an element in the editor UI for credit cards. */
-    protected void clickInCardEditorAndWait(final int resourceId, CallbackHelper helper)
-            throws InterruptedException, TimeoutException {
-        int callCount = helper.getCallCount();
-        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
-            @Override
-            public void run() {
-                mUI.getCardEditorView().findViewById(resourceId).performClick();
-            }
-        });
-        helper.waitForCallback(callCount);
     }
 
     /** Clicks on an element in the editor UI. */
     protected void clickInEditorAndWait(final int resourceId, CallbackHelper helper)
             throws InterruptedException, TimeoutException {
         int callCount = helper.getCallCount();
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 mUI.getEditorView().findViewById(resourceId).performClick();
@@ skipping 79 matching lines @@
     protected int getNumberOfShippingAddressSuggestions() throws ExecutionException {
         return ThreadUtils.runOnUiThreadBlocking(new Callable<Integer>() {
             @Override
             public Integer call() {
                 return ((OptionSection) mUI.getShippingAddressSectionForTest())
                         .getNumberOfOptionLabelsForTest();
             }
         });
     }
 
-    /** Selects the spinner value in the editor UI for credit cards. */
-    protected void setSpinnerSelectionsInCardEditorAndWait(final int[] selections,
-            CallbackHelper helper) throws InterruptedException, TimeoutException {
-        int callCount = helper.getCallCount();
-        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
-            @Override
-            public void run() {
-                List<Spinner> fields = mUI.getCardEditorView().getDropdownFieldsForTest();
-                for (int i = 0; i < selections.length && i < fields.size(); i++) {
-                    fields.get(i).setSelection(selections[i]);
-                }
-            }
-        });
-        helper.waitForCallback(callCount);
-    }
-
     /** Selects the spinner value in the editor UI. */
-    protected void setSpinnerSelectionInEditorAndWait(final int selection, CallbackHelper helper)
+    protected void setSpinnerSelectionInEditor(final int selection, CallbackHelper helper)
             throws InterruptedException, TimeoutException {
         int callCount = helper.getCallCount();
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 ((Spinner) mUI.getEditorView().findViewById(R.id.spinner)).setSelection(selection);
             }
         });
         helper.waitForCallback(callCount);
-    }
-
-    /** Directly sets the text in the editor UI for credit cards. */
-    protected void setTextInCardEditorAndWait(final String[] values, CallbackHelper helper)
-            throws InterruptedException, TimeoutException {
-        int callCount = helper.getCallCount();
-        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
-            @Override
-            public void run() {
-                ViewGroup contents = (ViewGroup)
-                        mUI.getCardEditorView().findViewById(R.id.contents);
-                assertNotNull(contents);
-                for (int i = 0, j = 0; i < contents.getChildCount() && j < values.length; i++) {
-                    View view = contents.getChildAt(i);
-                    if (view instanceof EditorTextField) {
-                        ((EditorTextField) view).getEditText().setText(values[j++]);
-                    }
-                }
-            }
-        });
-        helper.waitForCallback(callCount);
     }
 
     /** Directly sets the text in the editor UI. */
     protected void setTextInEditorAndWait(final String[] values, CallbackHelper helper)
             throws InterruptedException, TimeoutException {
         int callCount = helper.getCallCount();
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                List<EditText> fields = mUI.getEditorView().getEditableTextFieldsForTest();
+                List<EditorTextField> fields = mUI.getEditorView().getEditorTextFields();
                 for (int i = 0; i < values.length; i++) {
-                    fields.get(i).setText(values[i]);
+                    fields.get(i).getEditText().setText(values[i]);
                 }
             }
         });
         helper.waitForCallback(callCount);
-    }
-
-    /** Directly sets the checkbox selection in the editor UI for credit cards. */
-    protected void selectCheckboxAndWait(final int resourceId, final boolean isChecked,
-            CallbackHelper helper) throws InterruptedException, TimeoutException {
-        int callCount = helper.getCallCount();
-        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
-            @Override
-            public void run() {
-                ((CheckBox) mUI.getCardEditorView().findViewById(resourceId)).setChecked(isChecked);
-            }
-        });
-        helper.waitForCallback(callCount);
     }
 
     /** Directly sets the text in the card unmask UI. */
     protected void setTextInCardUnmaskDialogAndWait(final int resourceId, final String input,
             CallbackHelper helper) throws InterruptedException, TimeoutException {
         int callCount = helper.getCallCount();
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 ((EditText) mCardUnmaskPrompt.getDialogForTest().findViewById(resourceId))
@@ skipping 87 matching lines @@
         mDismissed.notifyCalled();
     }
 
     @Override
     public void onPaymentRequestServiceUnableToAbort() {
         ThreadUtils.assertOnUiThread();
         mUnableToAbort.notifyCalled();
     }
 
     @Override
-    public void onPaymentRequestServiceBillingAddressChangeProcessed() {
-        ThreadUtils.assertOnUiThread();
-        mBillingAddressChangeProcessed.notifyCalled();
-    }
-
-    @Override
     public void onCardUnmaskPromptReadyForInput(CardUnmaskPrompt prompt) {
         ThreadUtils.assertOnUiThread();
         mReadyForUnmaskInput.notifyCalled(prompt);
         mCardUnmaskPrompt = prompt;
     }
 
     @Override
     public void onCardUnmaskPromptReadyToUnmask(CardUnmaskPrompt prompt) {
         ThreadUtils.assertOnUiThread();
         mReadyToUnmask.notifyCalled(prompt);
@@ skipping 19 matching lines @@
          *
          * @param ui The UI that is ready for input.
          */
         public void notifyCalled(T target) {
             ThreadUtils.assertOnUiThread();
             mTarget = target;
             notifyCalled();
         }
     }
 }