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

components/autofill/core/browser/autofill_experiments.cc

 // Copyright 2015 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 "components/autofill/core/browser/autofill_experiments.h"
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string16.h"
@@ skipping 128 matching lines @@
         IDS_AUTOFILL_CREDIT_CARD_EXPIRATION_DATE_LABEL_AND_ABBR);
     if (!format_string.empty()) {
       suggestion->value.append(l10n_util::GetStringFUTF16(
           IDS_AUTOFILL_CREDIT_CARD_EXPIRATION_DATE_LABEL_AND_ABBR,
           suggestion->label));
     }
     suggestion->label.clear();
   }
 }
 
+unsigned int GetPopupMargin() {
+  return GetCreditCardPopupParameterUintValue(kAutofillPopupMarginKey);
+}
+
 bool OfferStoreUnmaskedCards() {
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   // The checkbox can be forced on with a flag, but by default we don't store
   // on Linux due to lack of system keychain integration. See crbug.com/162735
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableOfferStoreUnmaskedWalletCards);
 #else
   // Query the field trial before checking command line flags to ensure UMA
   // reports the correct group.
   std::string group_name =
@@ skipping 56 matching lines @@
   }
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableOfferUploadCreditCards)) {
     return false;
   }
 
   return !group_name.empty() && group_name != "Disabled";
 }
 
 }  // namespace autofill