Use dropdown list for admin areas in pr form.

chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorView.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.ui;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
@@ skipping 310 matching lines @@
             EditorFieldModel nextFieldModel = null;
 
             boolean isLastField = i == mEditorModel.getFields().size() - 1;
             boolean useFullLine = fieldModel.isFullLine();
             if (!isLastField && !useFullLine) {
                 // If the next field isn't full, stretch it out.
                 nextFieldModel = mEditorModel.getFields().get(i + 1);
                 if (nextFieldModel.isFullLine()) useFullLine = true;
             }
 
-            if (useFullLine) {
+            if (useFullLine || isLastField) {
                 addFieldViewToEditor(mDataView, fieldModel);
             } else {
                 // Create a LinearLayout to put it and the next view side by side.
                 LinearLayout rowLayout = new LinearLayout(mContext);
                 mDataView.addView(rowLayout);
 
                 View firstView = addFieldViewToEditor(rowLayout, fieldModel);
                 View lastView = addFieldViewToEditor(rowLayout, nextFieldModel);
 
                 LinearLayout.LayoutParams firstParams =
@@ skipping 36 matching lines @@
             childView = new EditorLabelField(mContext, parent, fieldModel).getLayout();
         } else if (fieldModel.getInputTypeHint() == EditorFieldModel.INPUT_TYPE_HINT_DROPDOWN) {
             Runnable prepareEditorRunnable = new Runnable() {
                 @Override
                 public void run() {
                     // The fields may have changed.
                     prepareEditor();
                     if (mObserverForTest != null) mObserverForTest.onPaymentRequestReadyToEdit();
                 }
             };
-            EditorDropdownField dropdownView =
-                    new EditorDropdownField(mContext, parent, fieldModel, prepareEditorRunnable);
+            EditorDropdownField dropdownView = new EditorDropdownField(
+                    mContext, parent, fieldModel, prepareEditorRunnable, mObserverForTest);
             mFieldViews.add(dropdownView);
             mDropdownFields.add(dropdownView.getDropdown());
 
             childView = dropdownView.getLayout();
         } else if (fieldModel.getInputTypeHint() == EditorFieldModel.INPUT_TYPE_HINT_CHECKBOX) {
             final CheckBox checkbox = new CheckBox(mLayout.getContext());
             checkbox.setId(R.id.payments_edit_checkbox);
             checkbox.setText(fieldModel.getLabel());
             checkbox.setChecked(fieldModel.isChecked());
             checkbox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@@ skipping 138 matching lines @@
     public List<EditText> getEditableTextFieldsForTest() {
         return mEditableTextFields;
     }
 
     /** @return All dropdown fields in the editor. Used only for tests. */
     @VisibleForTesting
     public List<Spinner> getDropdownFieldsForTest() {
         return mDropdownFields;
     }
 }