Use dropdown list for admin areas in pr form.

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestShippingAddressTest.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 88 matching lines @@
     @MediumTest
     @Feature({"Payments"})
     public void testShippingAddressFormat_NewAddress()
             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", "555-555-5555"}, mEditorTextUpdate);
+                                             "90291", "555-555-5555"},
+                mEditorTextUpdate);
+        setSpinnerSelectionsInEditorAndWait(new int[] {US, CA}, mEditorTextUpdate);
         clickInEditorAndWait(R.id.payments_edit_done_button, mReadyToPay);
 
         // Make sure that the shipping label does not include the country.
         assertTrue(getShippingAddressOptionRowAtIndex(0).getLabelText().toString().equals(
                 "Seb Doe\nGoogle, 340 Main St, Los Angeles, CA 90291\n555-555-5555"));
     }
 
     /**
      * Test that going into the editor and clicking 'CANCEL' button to cancel editor will leave the
      * row checked.
@@ skipping 67 matching lines @@
         expectShippingAddressRowIsSelected(0);
         clickInShippingAddressAndWait(R.id.payments_add_option_button, mReadyToEdit);
 
         // Cancel the editor by clicking Android back button.
         clickAndroidBackButtonInEditorAndWait(mReadyToPay);
 
         // Expect the existing row to still be selected in the Shipping Address section.
         expectShippingAddressRowIsSelected(0);
     }
 }