[Payment Request] Error message screen

ios/chrome/browser/payments/shipping_option_selection_view_controller.mm

Index: ios/chrome/browser/payments/shipping_option_selection_view_controller.mm
diff --git a/ios/chrome/browser/payments/shipping_option_selection_view_controller.mm b/ios/chrome/browser/payments/shipping_option_selection_view_controller.mm
index e0fca85872027240ba251d5bd0f5212b671c9783..1d99e448414a9feb44fdf7453bb75bb45a83b4c6 100644
--- a/ios/chrome/browser/payments/shipping_option_selection_view_controller.mm
+++ b/ios/chrome/browser/payments/shipping_option_selection_view_controller.mm
@@ -12,6 +12,7 @@
 #include "components/strings/grit/components_strings.h"
 #import "ios/chrome/browser/payments/cells/payments_text_item.h"
 #include "ios/chrome/browser/payments/payment_request.h"
+#import "ios/chrome/browser/payments/shipping_option_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"
@@ -26,8 +27,8 @@
 #import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
 #include "ui/base/l10n/l10n_util.h"
 
-NSString* const kShippingOptionSelectionCollectionViewId =
-    @"kShippingOptionSelectionCollectionViewId";
+NSString* const kShippingOptionSelectionCollectionViewID =
+    @"kShippingOptionSelectionCollectionViewID";
 
 namespace {
 
@@ -45,7 +46,8 @@ typedef NS_ENUM(NSInteger, ItemType) {
 
 }  // namespace
 
-@interface ShippingOptionSelectionViewController () {
+@interface ShippingOptionSelectionViewController ()<
+    ShippingOptionSelectionViewControllerActions> {
   base::WeakNSProtocol<id<ShippingOptionSelectionViewControllerDelegate>>
       _delegate;
 
@@ -58,9 +60,6 @@ typedef NS_ENUM(NSInteger, ItemType) {
   CollectionViewTextItem* _selectedItem;
 }
 
-// Called when the user presses the return button.
-- (void)onReturn;
-
 @end
 
 @implementation ShippingOptionSelectionViewController
@@ -74,6 +73,7 @@ typedef NS_ENUM(NSInteger, ItemType) {
     self.title = l10n_util::GetNSString(
         IDS_IOS_PAYMENT_REQUEST_SHIPPING_OPTION_SELECTION_TITLE);
 
+    // Set up leading (return) button.
     UIBarButtonItem* returnButton =
         [ChromeIcon templateBarButtonItemWithImage:[ChromeIcon backIcon]
                                             target:nil
@@ -155,7 +155,7 @@ typedef NS_ENUM(NSInteger, ItemType) {
 - (void)viewDidLoad {
   [super viewDidLoad];
   self.collectionView.accessibilityIdentifier =
-      kShippingOptionSelectionCollectionViewId;
+      kShippingOptionSelectionCollectionViewID;
 
   // Customize collection view settings.
   self.styler.cellStyle = MDCCollectionViewCellStyleCard;