[Payment Request] Generic edit form

ios/chrome/browser/payments/payment_request_util.mm

 // Copyright 2016 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.
 
 #import "ios/chrome/browser/payments/payment_request_util.h"
 
 #include "base/strings/string16.h"
 #include "base/strings/string_split.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 13 matching lines @@
 
 namespace payment_request_util {
 
 NSString* GetNameLabelFromAutofillProfile(
     const autofill::AutofillProfile& profile) {
   return base::SysUTF16ToNSString(
       profile.GetInfo(autofill::AutofillType(autofill::NAME_FULL),
                       GetApplicationContext()->GetApplicationLocale()));
 }
 
-NSString* GetAddressLabelFromAutofillProfile(
+NSString* GetShippingAddressLabelFromAutofillProfile(
     const autofill::AutofillProfile& profile) {
   // Name and country are not included in the shipping address label.
   std::vector<autofill::ServerFieldType> label_fields;
   label_fields.push_back(autofill::COMPANY_NAME);
   label_fields.push_back(autofill::ADDRESS_HOME_LINE1);
   label_fields.push_back(autofill::ADDRESS_HOME_LINE2);
   label_fields.push_back(autofill::ADDRESS_HOME_DEPENDENT_LOCALITY);
   label_fields.push_back(autofill::ADDRESS_HOME_CITY);
   label_fields.push_back(autofill::ADDRESS_HOME_STATE);
   label_fields.push_back(autofill::ADDRESS_HOME_ZIP);
   label_fields.push_back(autofill::ADDRESS_HOME_SORTING_CODE);
 
   base::string16 label = profile.ConstructInferredLabel(
       label_fields, label_fields.size(),
       GetApplicationContext()->GetApplicationLocale());
   return !label.empty() ? base::SysUTF16ToNSString(label) : nil;
 }
 
+NSString* GetBillingAddressLabelFromAutofillProfile(

[lpromero, 2017/03/13 16:54:09]

This could go in its own CL maybe? Also, could you add a test file and a test
for this function? (It's ok leaving the other untested for now.)

[Moe, 2017/03/16 01:35:32]

Done. Moved to its own CL.

+    const autofill::AutofillProfile& profile) {
+  // Name, company, and country are not included in the billing address label.
+  std::vector<autofill::ServerFieldType> label_fields;
+  label_fields.push_back(autofill::ADDRESS_HOME_LINE1);
+  label_fields.push_back(autofill::ADDRESS_HOME_LINE2);
+  label_fields.push_back(autofill::ADDRESS_HOME_DEPENDENT_LOCALITY);
+  label_fields.push_back(autofill::ADDRESS_HOME_CITY);
+  label_fields.push_back(autofill::ADDRESS_HOME_STATE);
+  label_fields.push_back(autofill::ADDRESS_HOME_ZIP);
+  label_fields.push_back(autofill::ADDRESS_HOME_SORTING_CODE);
+
+  base::string16 label = profile.ConstructInferredLabel(
+      label_fields, label_fields.size(),
+      GetApplicationContext()->GetApplicationLocale());
+  return !label.empty() ? base::SysUTF16ToNSString(label) : nil;
+}
+
 NSString* GetPhoneNumberLabelFromAutofillProfile(
     const autofill::AutofillProfile& profile) {
   base::string16 label = profile.GetRawInfo(autofill::PHONE_HOME_WHOLE_NUMBER);
   return !label.empty() ? base::SysUTF16ToNSString(label) : nil;
 }
 
 NSString* GetEmailLabelFromAutofillProfile(
     const autofill::AutofillProfile& profile) {
   base::string16 label = profile.GetRawInfo(autofill::EMAIL_ADDRESS);
   return !label.empty() ? base::SysUTF16ToNSString(label) : nil;
@@ skipping 143 matching lines @@
       return l10n_util::GetNSString(IDS_PAYMENTS_UNSUPPORTED_DELIVERY_OPTION);
     case web::PaymentShippingType::PICKUP:
       return l10n_util::GetNSString(IDS_PAYMENTS_UNSUPPORTED_PICKUP_OPTION);
     default:
       NOTREACHED();
       return @"";
   }
 }
 
 }  // namespace payment_request_util