[Payment Request] Error message screen

ios/chrome/browser/payments/shipping_address_selection_view_controller.mm

Index: ios/chrome/browser/payments/shipping_address_selection_view_controller.mm
diff --git a/ios/chrome/browser/payments/shipping_address_selection_view_controller.mm b/ios/chrome/browser/payments/shipping_address_selection_view_controller.mm
index 9e411e72a91604869e53000273be1e1fdee4738a..30d89193adadcf710b28cedf31a2db8ee8054efb 100644
--- a/ios/chrome/browser/payments/shipping_address_selection_view_controller.mm
+++ b/ios/chrome/browser/payments/shipping_address_selection_view_controller.mm
@@ -14,6 +14,7 @@
 #import "ios/chrome/browser/payments/cells/payments_text_item.h"
 #import "ios/chrome/browser/payments/cells/shipping_address_item.h"
 #import "ios/chrome/browser/payments/payment_request_util.h"
+#import "ios/chrome/browser/payments/shipping_address_selection_view_controller_actions.h"
 #import "ios/chrome/browser/ui/autofill/cells/status_item.h"
 #import "ios/chrome/browser/ui/collection_view/cells/MDCCollectionViewCell+Chrome.h"
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
@@ -30,8 +31,8 @@ using payment_request_util::NameLabelFromAutofillProfile;
 using payment_request_util::AddressLabelFromAutofillProfile;
 using payment_request_util::PhoneNumberLabelFromAutofillProfile;
 
-NSString* const kShippingAddressSelectionCollectionViewId =
-    @"kShippingAddressSelectionCollectionViewId";
+NSString* const kShippingAddressSelectionCollectionViewID =
+    @"kShippingAddressSelectionCollectionViewID";
 
 namespace {
 
@@ -50,7 +51,8 @@ typedef NS_ENUM(NSInteger, ItemType) {
 
 }  // namespace
 
-@interface ShippingAddressSelectionViewController () {
+@interface ShippingAddressSelectionViewController ()<
+    ShippingAddressSelectionViewControllerActions> {
   base::WeakNSProtocol<id<ShippingAddressSelectionViewControllerDelegate>>
       _delegate;
 
@@ -63,9 +65,6 @@ typedef NS_ENUM(NSInteger, ItemType) {
   ShippingAddressItem* _selectedItem;
 }
 
-// Called when the user presses the return button.
-- (void)onReturn;
-
 @end
 
 @implementation ShippingAddressSelectionViewController
@@ -79,6 +78,7 @@ typedef NS_ENUM(NSInteger, ItemType) {
     self.title = l10n_util::GetNSString(
         IDS_IOS_PAYMENT_REQUEST_SHIPPING_ADDRESS_SELECTION_TITLE);
 
+    // Set up leading (return) button.
     UIBarButtonItem* returnButton =
         [ChromeIcon templateBarButtonItemWithImage:[ChromeIcon backIcon]
                                             target:nil
@@ -163,7 +163,7 @@ typedef NS_ENUM(NSInteger, ItemType) {
 - (void)viewDidLoad {
   [super viewDidLoad];
   self.collectionView.accessibilityIdentifier =
-      kShippingAddressSelectionCollectionViewId;
+      kShippingAddressSelectionCollectionViewID;
 
   // Customize collection view settings.
   self.styler.cellStyle = MDCCollectionViewCellStyleCard;