[Merge M57] Use uniform margin for icon, label and sublabel

chrome/browser/ui/autofill/autofill_popup_layout_model.h

Index: chrome/browser/ui/autofill/autofill_popup_layout_model.h
diff --git a/chrome/browser/ui/autofill/autofill_popup_layout_model.h b/chrome/browser/ui/autofill/autofill_popup_layout_model.h
index 8c6223ff7d15c515773fa9700ed89cc6e8505bee..f82711148f4150ead6c589d3d6926def93f9b9c5 100644
--- a/chrome/browser/ui/autofill/autofill_popup_layout_model.h
+++ b/chrome/browser/ui/autofill/autofill_popup_layout_model.h
@@ -116,6 +116,10 @@ class AutofillPopupLayoutModel {
   // Returns true if suggestion icon must be displayed before suggestion text.
   bool IsIconAtStart(int frontend_id) const;
 
+  // Returns the margin for icon, label and between icon and label, or 0 if the
+  // margin isn't configured in an experiment to tweak autofill popup layout.
+  unsigned int GetMargin() const;
+
  private:
   // Returns the enclosing rectangle for the element_bounds.
   const gfx::Rect RoundedElementBounds() const;