Revert of A drop-down should take a line to be always aligned with text-fields.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorView.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorView.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorView.java
index ee52870ee7e38736633e8135beab70a747370747..3c9164b5c934e56954b04ee05f45ea0c91f72a9f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorView.java
@@ -321,19 +321,14 @@
             EditorFieldModel nextFieldModel = null;
 
             boolean isLastField = i == mEditorModel.getFields().size() - 1;
-            // Dropdown fields will take a full line
-            boolean useFullLine = fieldModel.isFullLine() || isLastField
-                    || (fieldModel.getInputTypeHint() == EditorFieldModel.INPUT_TYPE_HINT_DROPDOWN);
-
-            if (!useFullLine) {
+            boolean useFullLine = fieldModel.isFullLine();
+            if (!isLastField && !useFullLine) {
                 // If the next field isn't full, stretch it out.
                 nextFieldModel = mEditorModel.getFields().get(i + 1);
-                useFullLine = useFullLine || nextFieldModel.isFullLine()
-                        || (nextFieldModel.getInputTypeHint()
-                                   == EditorFieldModel.INPUT_TYPE_HINT_DROPDOWN);
-            }
-
-            if (useFullLine) {
+                if (nextFieldModel.isFullLine()) useFullLine = true;
+            }
+
+            if (useFullLine || isLastField) {
                 addFieldViewToEditor(mDataView, fieldModel);
             } else {
                 // Create a LinearLayout to put it and the next view side by side.