[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..4dc9d07a1468e5e85c63f10266e96531c31d3782 100644
--- a/ios/chrome/browser/payments/shipping_option_selection_view_controller.mm
+++ b/ios/chrome/browser/payments/shipping_option_selection_view_controller.mm
@@ -26,8 +26,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 {
 
@@ -74,6 +74,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 +156,7 @@ typedef NS_ENUM(NSInteger, ItemType) {
 - (void)viewDidLoad {
   [super viewDidLoad];
   self.collectionView.accessibilityIdentifier =
-      kShippingOptionSelectionCollectionViewId;
+      kShippingOptionSelectionCollectionViewID;
 
   // Customize collection view settings.
   self.styler.cellStyle = MDCCollectionViewCellStyleCard;