[Payment Request] Generic edit form

ios/chrome/browser/payments/payment_request_view_controller.mm

Index: ios/chrome/browser/payments/payment_request_view_controller.mm
diff --git a/ios/chrome/browser/payments/payment_request_view_controller.mm b/ios/chrome/browser/payments/payment_request_view_controller.mm
index f643121fcf318b6a28cb7e4387abb07d4cae3c5e..b767803ba86f54ea34a5b50c9b4fba575568a56e 100644
--- a/ios/chrome/browser/payments/payment_request_view_controller.mm
+++ b/ios/chrome/browser/payments/payment_request_view_controller.mm
@@ -34,7 +34,6 @@
 #import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.h"
 #import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h"
 #import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
-#import "ios/third_party/material_roboto_font_loader_ios/src/src/MaterialRobotoFontLoader.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
@@ -44,7 +43,7 @@
 
 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::GetEmailLabelFromAutofillProfile;
 using ::payment_request_util::GetShippingSectionTitle;
@@ -420,7 +419,7 @@ typedef NS_ENUM(NSInteger, ItemType) {
             withAutofillProfile:(autofill::AutofillProfile*)profile {
   DCHECK(profile);
   item.name = GetNameLabelFromAutofillProfile(*profile);
-  item.address = GetAddressLabelFromAutofillProfile(*profile);
+  item.address = GetShippingAddressLabelFromAutofillProfile(*profile);
   item.phoneNumber = GetPhoneNumberLabelFromAutofillProfile(*profile);
 }