Revert of [Payments] Update autofill/payments spacings

chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorDropdownField.java

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorDropdownField.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorDropdownField.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorDropdownField.java
index c853391e2b1f990cfb5ed8e9ca81d463dae34e98..959310adab568ddab7ea51a6e14e0618d535f0c1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorDropdownField.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorDropdownField.java
@@ -5,7 +5,6 @@
 package org.chromium.chrome.browser.payments.ui;
 
 import android.content.Context;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemSelectedListener;
@@ -13,7 +12,6 @@
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import org.chromium.chrome.R;
 import org.chromium.chrome.browser.preferences.autofill.AutofillProfileBridge.DropdownKeyValue;
 
 import java.util.List;
@@ -23,7 +21,6 @@
  */
 class EditorDropdownField {
     private final EditorFieldModel mFieldModel;
-    private final View mLayout;
     private final TextView mLabel;
     private final Spinner mDropdown;
     private int mSelectedIndex;
@@ -41,10 +38,7 @@
         assert fieldModel.getInputTypeHint() == EditorFieldModel.INPUT_TYPE_HINT_DROPDOWN;
         mFieldModel = fieldModel;
 
-        mLayout = LayoutInflater.from(context).inflate(
-                R.layout.payment_request_editor_dropdown, null, false);
-
-        mLabel = (TextView) mLayout.findViewById(R.id.spinner_label);
+        mLabel = new TextView(context);
         mLabel.setText(mFieldModel.getLabel());
 
         final List<DropdownKeyValue> dropdownKeyValues = mFieldModel.getDropdownKeyValues();
@@ -55,12 +49,11 @@
             }
         }
 
-        ArrayAdapter<DropdownKeyValue> adapter = new ArrayAdapter<DropdownKeyValue>(
-                context, android.R.layout.simple_spinner_item, dropdownKeyValues);
+        ArrayAdapter<DropdownKeyValue> adapter = new ArrayAdapter<DropdownKeyValue>(context,
+                android.R.layout.simple_spinner_item, dropdownKeyValues);
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
 
-        mDropdown = (Spinner) mLayout.findViewById(R.id.spinner);
-        mDropdown.setContentDescription(mFieldModel.getLabel());
+        mDropdown = new Spinner(context);
         mDropdown.setAdapter(adapter);
         mDropdown.setSelection(mSelectedIndex);
         mDropdown.setOnItemSelectedListener(new OnItemSelectedListener() {
@@ -78,11 +71,6 @@
         });
     }
 
-    /** @return The View containing everything. */
-    public View getLayout() {
-        return mLayout;
-    }
-
     /** @return The EditorFieldModel that the EditorDropdownField represents. */
     public EditorFieldModel getFieldModel() {
         return mFieldModel;