[Payment Request] Error message screen

ios/chrome/browser/payments/payment_items_display_view_controller.mm

Index: ios/chrome/browser/payments/payment_items_display_view_controller.mm
diff --git a/ios/chrome/browser/payments/payment_items_display_view_controller.mm b/ios/chrome/browser/payments/payment_items_display_view_controller.mm
index 53c03ed609664a12c929bd67a72af61154a9ccd6..042d64111b481215f5697b4f17aa48d9e10ceb43 100644
--- a/ios/chrome/browser/payments/payment_items_display_view_controller.mm
+++ b/ios/chrome/browser/payments/payment_items_display_view_controller.mm
@@ -13,6 +13,7 @@
 #include "components/payments/currency_formatter.h"
 #include "components/strings/grit/components_strings.h"
 #import "ios/chrome/browser/payments/cells/price_item.h"
+#import "ios/chrome/browser/payments/payment_items_display_view_controller_actions.h"
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
 #import "ios/chrome/browser/ui/collection_view/collection_view_model.h"
 #import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h"
@@ -23,9 +24,9 @@
 #import "ios/third_party/material_roboto_font_loader_ios/src/src/MaterialRobotoFontLoader.h"
 #include "ui/base/l10n/l10n_util.h"
 
-NSString* const kPaymentItemsDisplayCollectionViewId =
-    @"kPaymentItemsDisplayCollectionViewId";
-NSString* const kPaymentItemsDisplayItemId = @"kPaymentItemsDisplayItemId";
+NSString* const kPaymentItemsDisplayCollectionViewID =
+    @"kPaymentItemsDisplayCollectionViewID";
+NSString* const kPaymentItemsDisplayItemID = @"kPaymentItemsDisplayItemID";
 
 namespace {
 
@@ -43,7 +44,8 @@ typedef NS_ENUM(NSInteger, ItemType) {
 
 }  // namespace
 
-@interface PaymentItemsDisplayViewController () {
+@interface PaymentItemsDisplayViewController ()<
+    PaymentItemsDisplayViewControllerActions> {
   base::WeakNSProtocol<id<PaymentItemsDisplayViewControllerDelegate>> _delegate;
   base::scoped_nsobject<MDCFlatButton> _payButton;
 
@@ -53,12 +55,6 @@ typedef NS_ENUM(NSInteger, ItemType) {
   PaymentRequest* _paymentRequest;
 }
 
-// Called when the user presses the return button.
-- (void)onReturn;
-
-// Called when the user presses the pay button.
-- (void)onConfirm;
-
 @end
 
 @implementation PaymentItemsDisplayViewController
@@ -70,7 +66,7 @@ typedef NS_ENUM(NSInteger, ItemType) {
     [self setTitle:l10n_util::GetNSString(
                        IDS_IOS_PAYMENT_REQUEST_PAYMENT_ITEMS_TITLE)];
 
-    // Set up left (return) button.
+    // Set up leading (return) button.
     UIBarButtonItem* returnButton =
         [ChromeIcon templateBarButtonItemWithImage:[ChromeIcon backIcon]
                                             target:nil
@@ -79,7 +75,7 @@ typedef NS_ENUM(NSInteger, ItemType) {
         setAccessibilityLabel:l10n_util::GetNSString(IDS_ACCNAME_BACK)];
     [self navigationItem].leftBarButtonItem = returnButton;
 
-    // Set up right (pay) button.
+    // Set up trailing (pay) button.
     _payButton.reset([[MDCFlatButton alloc] init]);
     [_payButton
         setTitle:l10n_util::GetNSString(IDS_IOS_PAYMENT_REQUEST_PAY_BUTTON)
@@ -151,7 +147,7 @@ typedef NS_ENUM(NSInteger, ItemType) {
   // Add the total entry.
   PriceItem* totalItem =
       [[[PriceItem alloc] initWithType:ItemTypePaymentItemTotal] autorelease];
-  totalItem.accessibilityIdentifier = kPaymentItemsDisplayItemId;
+  totalItem.accessibilityIdentifier = kPaymentItemsDisplayItemID;
   totalItem.item =
       base::SysUTF16ToNSString(_paymentRequest->payment_details().total.label);
   payments::CurrencyFormatter* currencyFormatter =
@@ -169,7 +165,7 @@ typedef NS_ENUM(NSInteger, ItemType) {
        _paymentRequest->payment_details().display_items) {
     PriceItem* paymentItemItem =
         [[[PriceItem alloc] initWithType:ItemTypePaymentItem] autorelease];
-    paymentItemItem.accessibilityIdentifier = kPaymentItemsDisplayItemId;
+    paymentItemItem.accessibilityIdentifier = kPaymentItemsDisplayItemID;
     paymentItemItem.item = base::SysUTF16ToNSString(paymentItem.label);
     payments::CurrencyFormatter* currencyFormatter =
         _paymentRequest->GetOrCreateCurrencyFormatter();
@@ -183,7 +179,7 @@ typedef NS_ENUM(NSInteger, ItemType) {
 - (void)viewDidLoad {
   [super viewDidLoad];
   self.collectionView.accessibilityIdentifier =
-      kPaymentItemsDisplayCollectionViewId;
+      kPaymentItemsDisplayCollectionViewID;
 
   // Customize collection view settings.
   self.styler.cellStyle = MDCCollectionViewCellStyleCard;