[Payment Request] Generic edit form

ios/chrome/browser/payments/shipping_address_selection_view_controller.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/shipping_address_selection_view_controller.h"
 
 #include "base/mac/foundation_util.h"
 
 #include "base/strings/sys_string_conversions.h"
 #include "components/autofill/core/browser/autofill_profile.h"
@@ skipping 14 matching lines @@
 #include "ios/chrome/grit/ios_strings.h"
 #include "ios/chrome/grit/ios_theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 namespace {
 using ::payment_request_util::GetNameLabelFromAutofillProfile;
-using ::payment_request_util::GetAddressLabelFromAutofillProfile;
+using ::payment_request_util::GetShippingAddressLabelFromAutofillProfile;
 using ::payment_request_util::GetPhoneNumberLabelFromAutofillProfile;
 using ::payment_request_util::GetShippingAddressSelectorTitle;
 using ::payment_request_util::GetShippingAddressSelectorInfoMessage;
 
 NSString* const kShippingAddressSelectionCollectionViewID =
     @"kShippingAddressSelectionCollectionViewID";
 
 const CGFloat kSeparatorEdgeInset = 14;
 
 typedef NS_ENUM(NSInteger, SectionIdentifier) {
@@ skipping 77 matching lines @@
   }
   [model addItem:messageItem
       toSectionWithIdentifier:SectionIdentifierShippingAddress];
 
   for (auto* shippingAddress : _paymentRequest->shipping_profiles()) {
     DCHECK(shippingAddress);
     AutofillProfileItem* item =
         [[AutofillProfileItem alloc] initWithType:ItemTypeShippingAddress];
     item.accessibilityTraits |= UIAccessibilityTraitButton;
     item.name = GetNameLabelFromAutofillProfile(*shippingAddress);
-    item.address = GetAddressLabelFromAutofillProfile(*shippingAddress);
+    item.address = GetShippingAddressLabelFromAutofillProfile(*shippingAddress);
     item.phoneNumber = GetPhoneNumberLabelFromAutofillProfile(*shippingAddress);
     if (_paymentRequest->selected_shipping_profile() == shippingAddress) {
       item.accessoryType = MDCCollectionViewCellAccessoryCheckmark;
       _selectedItem = item;
     }
     [model addItem:item
         toSectionWithIdentifier:SectionIdentifierShippingAddress];
   }
 
   PaymentsTextItem* addShippingAddress =
@@ skipping 108 matching lines @@
     hidesInkViewAtIndexPath:(NSIndexPath*)indexPath {
   NSInteger type = [self.collectionViewModel itemTypeForIndexPath:indexPath];
   if (type == ItemTypeMessage) {
     return YES;
   } else {
     return NO;
   }
 }
 
 @end