Use dropdown list for admin areas in pr form.

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestBillingAddressTest.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.support.test.filters.MediumTest;
 
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.R;
@@ skipping 233 matching lines @@
     public void testBillingAddressSortedByFrecency_AddNewAddress()
             throws InterruptedException, ExecutionException, TimeoutException {
         // Add a payment method.
         triggerUIAndWait(mReadyToPay);
         clickInPaymentMethodAndWait(R.id.payments_section, mReadyForInput);
         clickInPaymentMethodAndWait(R.id.payments_add_option_button, mReadyToEdit);
 
         // Add a new billing address.
         setSpinnerSelectionsInCardEditorAndWait(
                 new int[] {DECEMBER, NEXT_YEAR, ADD_BILLING_ADDRESS}, mReadyToEdit);
+

[sebsg, 2017/02/28 16:13:59]

Nit: remove new-line

[Parastoo, 2017/03/21 14:30:44]

Done.

         setTextInEditorAndWait(new String[] {"Seb Doe", "Google", "340 Main St", "Los Angeles",
-                "CA", "90291", "999-999-9999"}, mEditorTextUpdate);
+                                             "90291", "999-999-9999"},
+                mEditorTextUpdate);
+        setSpinnerSelectionsInEditorAndWait(new int[] {US, CA}, mEditorTextUpdate);
+
         clickInEditorAndWait(R.id.payments_edit_done_button, mReadyToEdit);
 
         // There should be 9 suggestions, the 7 initial addresses, the newly added address and the
         // option to add a new address.
         assertEquals(9, getSpinnerItemCountInCardEditor(BILLING_ADDRESS_DROPDOWN_INDEX));
 
         // The fist suggestion should be the newly added address.
         assertTrue(getSpinnerTextAtPositionInCardEditor(BILLING_ADDRESS_DROPDOWN_INDEX,
                 0).equals("Seb Doe, 340 Main St, Los Angeles, CA 90291"));
 
@@ skipping 15 matching lines @@
     @MediumTest
     @Feature({"Payments"})
     public void testNewShippingAddressSuggestedFirst()
             throws InterruptedException, ExecutionException, TimeoutException {
         triggerUIAndWait(mReadyToPay);
 
         // Add a shipping address.
         clickInShippingSummaryAndWait(R.id.payments_section, mReadyForInput);
         clickInShippingAddressAndWait(R.id.payments_add_option_button, mReadyToEdit);
         setTextInEditorAndWait(new String[] {"Seb Doe", "Google", "340 Main St", "Los Angeles",
-                "CA", "90291", "999-999-9999"}, mEditorTextUpdate);
+                                             "90291", "999-999-9999"},
+                mEditorTextUpdate);
+        setSpinnerSelectionsInEditorAndWait(new int[] {US, CA}, mEditorTextUpdate);
+
         clickInEditorAndWait(R.id.payments_edit_done_button, mReadyToPay);
 
         // Navigate to the card editor UI.
         clickInPaymentMethodAndWait(R.id.payments_section, mReadyForInput);
         clickInPaymentMethodAndWait(R.id.payments_add_option_button, mReadyToEdit);
 
         // There should be 9 suggestions, the 7 initial addresses, the newly added address and the
         // option to add a new address.
         assertEquals(9, getSpinnerItemCountInCardEditor(BILLING_ADDRESS_DROPDOWN_INDEX));
 
@@ skipping 21 matching lines @@
         assertTrue(getSpinnerTextAtPositionInCardEditor(BILLING_ADDRESS_DROPDOWN_INDEX,
                 4).endsWith("Recipient required"));
         assertTrue(getSpinnerTextAtPositionInCardEditor(BILLING_ADDRESS_DROPDOWN_INDEX,
                 5).endsWith("More information required"));
         assertTrue(getSpinnerTextAtPositionInCardEditor(BILLING_ADDRESS_DROPDOWN_INDEX,
                 6).endsWith("Invalid address"));
 
         // Selects the fourth billing addresss that misses phone number brings up the address
         // editor.
         setSpinnerSelectionsInCardEditorAndWait(new int[] {DECEMBER, NEXT_YEAR, 3}, mReadyToEdit);
+

[sebsg, 2017/02/28 16:13:59]

Nit: Remove new-line

[Parastoo, 2017/03/21 14:30:44]

Done.

         setTextInEditorAndWait(new String[] {"Lisa Doe", "Google", "340 Main St", "Los Angeles",
-                "CA", "90291", "999-999-9999"}, mEditorTextUpdate);
+                                             "90291", "999-999-9999"},
+                mEditorTextUpdate);
+
         clickInEditorAndWait(R.id.payments_edit_done_button, mReadyToEdit);
 
         // The newly completed address must be selected and put at the top of the dropdown.
         assertTrue(getSpinnerSelectionTextInCardEditor(BILLING_ADDRESS_DROPDOWN_INDEX)
                 .equals("Lisa Doe, 340 Main St, Los Angeles, CA 90291"));
         assertTrue(getSpinnerTextAtPositionInCardEditor(BILLING_ADDRESS_DROPDOWN_INDEX,
                 0).equals("Lisa Doe, 340 Main St, Los Angeles, CA 90291"));
     }
 
     @MediumTest
@@ skipping 22 matching lines @@
         // Selects the fifth billing addresss that misses recipient name brings up the address
         // editor.
         setSpinnerSelectionsInCardEditorAndWait(new int[] {DECEMBER, NEXT_YEAR, 4}, mReadyToEdit);
         clickInEditorAndWait(R.id.payments_edit_cancel_button, mReadyToEdit);
 
         // The previous selected address should be selected after canceling out from edit.
         assertTrue(getSpinnerSelectionTextInCardEditor(BILLING_ADDRESS_DROPDOWN_INDEX)
                 .equals("Jon Doe, 340 Main St, Los Angeles, CA 90291"));
     }
 }