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

chrome/browser/about_flags.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/about_flags.h"
 
 #include <iterator>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 658 matching lines @@
 kAutofillCreditCardPopupLayoutFeatureVariationIconAtStart[] = {
   {"is_credit_card_icon_at_start", "true"}};
 
 const FeatureEntry::FeatureParam
 kAutofillCreditCardPopupLayoutFeatureVariationDropdownItemHeight[] = {
   {"dropdown_item_height", "56"}};
 
 const FeatureEntry::FeatureParam
 kAutofillCreditCardPopupLayoutFeatureVariationExpanded[] = {
   {"is_credit_card_icon_at_start", "true"},
-  {"dropdown_item_height", "56"}};
+  {"dropdown_item_height", "56"},
+  {"margin", "18"}};
 
 const FeatureEntry::FeatureVariation
 kAutofillCreditCardPopupLayoutFeatureVariations[] = {
     {"Display credit card icon at start",
      kAutofillCreditCardPopupLayoutFeatureVariationIconAtStart,
      arraysize(kAutofillCreditCardPopupLayoutFeatureVariationIconAtStart),
      nullptr},
     {"Increase dropdown item height",
      kAutofillCreditCardPopupLayoutFeatureVariationDropdownItemHeight,
      arraysize(
@@ skipping 1722 matching lines @@
 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
 
 const FeatureEntry* GetFeatureEntries(size_t* count) {
   *count = arraysize(kFeatureEntries);
   return kFeatureEntries;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags