[Payment Request] Generic edit form

ios/chrome/browser/payments/payment_request_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/payment_request_view_controller.h"
 
 #include "base/mac/foundation_util.h"
 
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 16 matching lines @@
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_text_item.h"
 #import "ios/chrome/browser/ui/collection_view/collection_view_model.h"
 #import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h"
 #include "ios/chrome/browser/ui/rtl_geometry.h"
 #include "ios/chrome/browser/ui/uikit_ui_util.h"
 #include "ios/chrome/grit/ios_strings.h"
 #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"
 
 #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::GetEmailLabelFromAutofillProfile;
 using ::payment_request_util::GetShippingSectionTitle;
 using ::payment_request_util::GetShippingAddressSelectorTitle;
 using ::payment_request_util::GetShippingOptionSelectorTitle;
 
 }  // namespace
 
 NSString* const kPaymentRequestCollectionViewID =
     @"kPaymentRequestCollectionViewID";
@@ skipping 355 matching lines @@
       currencyFormatter->Format(base::UTF16ToASCII(paymentItem.amount.value))));
   item.notification = totalValueChanged
                           ? l10n_util::GetNSString(IDS_PAYMENTS_UPDATED_LABEL)
                           : nil;
 }
 
 - (void)fillShippingAddressItem:(AutofillProfileItem*)item
             withAutofillProfile:(autofill::AutofillProfile*)profile {
   DCHECK(profile);
   item.name = GetNameLabelFromAutofillProfile(*profile);
-  item.address = GetAddressLabelFromAutofillProfile(*profile);
+  item.address = GetShippingAddressLabelFromAutofillProfile(*profile);
   item.phoneNumber = GetPhoneNumberLabelFromAutofillProfile(*profile);
 }
 
 - (void)fillShippingOptionItem:(CollectionViewTextItem*)item
                     withOption:(web::PaymentShippingOption*)option {
   item.text = base::SysUTF16ToNSString(option->label);
   payments::CurrencyFormatter* currencyFormatter =
       _paymentRequest->GetOrCreateCurrencyFormatter();
   item.detailText = SysUTF16ToNSString(
       currencyFormatter->Format(base::UTF16ToASCII(option->amount.value)));
@@ skipping 126 matching lines @@
   NSInteger type = [self.collectionViewModel itemTypeForIndexPath:indexPath];
   if (type == ItemTypeSummaryTotal &&
       _paymentRequest->payment_details().display_items.empty()) {
     return YES;
   } else {
     return NO;
   }
 }
 
 @end