Fix styling of Form-Not-Secure warnings on Android

ui/android/java/src/org/chromium/ui/DropdownAdapter.java

Index: ui/android/java/src/org/chromium/ui/DropdownAdapter.java
diff --git a/ui/android/java/src/org/chromium/ui/DropdownAdapter.java b/ui/android/java/src/org/chromium/ui/DropdownAdapter.java
index ce74633ee7f54225aa6b82436ec8f04c7dd1930a..a8f0fdf7fce2b45b329e4b4f9e52e00610a15709 100644
--- a/ui/android/java/src/org/chromium/ui/DropdownAdapter.java
+++ b/ui/android/java/src/org/chromium/ui/DropdownAdapter.java
@@ -161,6 +161,8 @@ public class DropdownAdapter extends ArrayAdapter<DropdownItem> {
             sublabelView.setVisibility(View.GONE);
         } else {
             sublabelView.setText(sublabel);
+            sublabelView.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+                    mContext.getResources().getDimension(item.getSublabelFontSizeResId()));
             sublabelView.setVisibility(View.VISIBLE);
         }
 
@@ -176,6 +178,19 @@ public class DropdownAdapter extends ArrayAdapter<DropdownItem> {
         if (item.getIconId() == DropdownItem.NO_ICON) {
             iconView.setVisibility(View.GONE);
         } else {
+            int iconSizeResId = item.getIconSizeResId();
+            int iconSize = iconSizeResId == 0
+                    ? LayoutParams.WRAP_CONTENT
+                    : mContext.getResources().getDimensionPixelSize(iconSizeResId);
+            ViewGroup.MarginLayoutParams layoutParams =
+                    (ViewGroup.MarginLayoutParams) iconView.getLayoutParams();
+            layoutParams.width = iconSize;
+            layoutParams.height = iconSize;
+            int iconMargin =
+                    mContext.getResources().getDimensionPixelSize(item.getIconMarginResId());
+            ApiCompatibilityUtils.setMarginStart(layoutParams, iconMargin);
+            ApiCompatibilityUtils.setMarginEnd(layoutParams, iconMargin);
+            iconView.setLayoutParams(layoutParams);
             iconView.setImageDrawable(AppCompatResources.getDrawable(mContext, item.getIconId()));
             iconView.setVisibility(View.VISIBLE);
         }