PaymentRequest: Rename ContactInfo to PayerInfo.

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.os.Handler;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
@@ skipping 191 matching lines @@
         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)
+    /** Clicks on an element in the "Payer Info" section of the payments UI. */
+    protected void clickInPayerInfoAndWait(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();
+                mUI.getPayerInfoDetailsSectionForTest().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() {
@@ skipping 46 matching lines @@
         return ThreadUtils.runOnUiThreadBlocking(new Callable<String>() {
             @Override
             public String call() {
                 return ((OptionSection) mUI.getPaymentMethodSectionForTest())
                         .getOptionLabelsForTest(index).getText().toString();
             }
         });
     }
 
     /**
-     *  Returns the label corresponding to the contact detail suggestion at the specified
+     *  Returns the label corresponding to the payer information detail suggestion at the specified
      *  |suggestionIndex|.
      */
-    protected String getContactDetailsSuggestionLabel(final int suggestionIndex)
+    protected String getPayerInfoDetailsSuggestionLabel(final int suggestionIndex)
             throws ExecutionException {
         return ThreadUtils.runOnUiThreadBlocking(new Callable<String>() {
             @Override
             public String call() {
-                return ((OptionSection) mUI.getContactDetailsSectionForTest())
+                return ((OptionSection) mUI.getPayerInfoDetailsSectionForTest())
                         .getOptionLabelsForTest(suggestionIndex).getText().toString();
             }
         });
     }
 
     /**  Returns the the number of payment instruments. */
     protected int getNumberOfPaymentInstruments() throws ExecutionException {
         return ThreadUtils.runOnUiThreadBlocking(new Callable<Integer>() {
             @Override
             public Integer call() {
                 return ((OptionSection) mUI.getPaymentMethodSectionForTest())
                         .getNumberOfOptionLabelsForTest();
             }
         });
     }
 
-    /**  Returns the the number of contact detail suggestions. */
-    protected int getNumberOfContactDetailSuggestions() throws ExecutionException {
+    /**  Returns the the number of payer information detail suggestions. */
+    protected int getNumberOfPayerInfoDetailSuggestions() throws ExecutionException {
         return ThreadUtils.runOnUiThreadBlocking(new Callable<Integer>() {
             @Override
             public Integer call() {
-                return ((OptionSection) mUI.getContactDetailsSectionForTest())
+                return ((OptionSection) mUI.getPayerInfoDetailsSectionForTest())
                         .getNumberOfOptionLabelsForTest();
             }
         });
     }
 
     /**
      *  Returns the label corresponding to the shipping address suggestion at the specified
      *  |suggestionIndex|.
      */
     protected String getShippingAddressSuggestionLabel(final int suggestionIndex)
@@ skipping 118 matching lines @@
     }
 
     /** 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();
+
                 for (int i = 0; i < values.length; i++) {
                     fields.get(i).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,
@@ skipping 265 matching lines @@
         public void getDetails(String merchantName, String origin, PaymentItem total,
                 List<PaymentItem> cart, JSONObject details, DetailsCallback detailsCallback) {
             detailsCallback.onInstrumentDetailsReady(
                     mMethodName, "{\"transaction\": 1337}");
         }
 
         @Override
         public void dismiss() {}
     }
 }