EarlGrey tests for Payment Request (base CL)

ios/chrome/browser/payments/payment_request_view_controller.mm

Index: ios/chrome/browser/payments/payment_request_view_controller.mm
diff --git a/ios/chrome/browser/payments/payment_request_view_controller.mm b/ios/chrome/browser/payments/payment_request_view_controller.mm
index 55775161c5ca586413c3f3238f104dea3106ad46..6f2745323545c8ee88da8dfbd11a752b80e38abc 100644
--- a/ios/chrome/browser/payments/payment_request_view_controller.mm
+++ b/ios/chrome/browser/payments/payment_request_view_controller.mm
@@ -14,6 +14,7 @@
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
+#include "components/strings/grit/components_strings.h"
 #include "ios/chrome/browser/application_context.h"
 #import "ios/chrome/browser/payments/cells/page_info_item.h"
 #import "ios/chrome/browser/payments/cells/payment_method_item.h"
@@ -33,6 +34,10 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
+using payment_request_utils::NameLabelFromAutofillProfile;
+using payment_request_utils::AddressLabelFromAutofillProfile;
+using payment_request_utils::PhoneNumberLabelFromAutofillProfile;
+
 NSString* const kPaymentRequestCollectionViewId =
     @"kPaymentRequestCollectionViewId";
 
@@ -106,6 +111,8 @@ typedef NS_ENUM(NSInteger, ItemType) {
       NSForegroundColorAttributeName : [UIColor lightGrayColor]
     }
                                  forState:UIControlStateDisabled];
+    [_cancelButton
+        setAccessibilityLabel:l10n_util::GetNSString(IDS_ACCNAME_CANCEL)];
     [self navigationItem].leftBarButtonItem = _cancelButton;
 
     // Set up right (pay) button.
@@ -121,6 +128,9 @@ typedef NS_ENUM(NSInteger, ItemType) {
     [_payButton addTarget:nil
                    action:@selector(onConfirm)
          forControlEvents:UIControlEventTouchUpInside];
+    [_payButton
+        setAccessibilityLabel:l10n_util::GetNSString(
+                                  IDS_IOS_ACCNAME_PAYMENT_REQUEST_PAY_BUTTON)];
     [_payButton sizeToFit];
     [_payButton setEnabled:NO];
     [_payButton setAutoresizingMask:UIViewAutoresizingFlexibleTrailingMargin() |
@@ -316,12 +326,9 @@ typedef NS_ENUM(NSInteger, ItemType) {
 
 - (void)fillShippingAddressItem:(ShippingAddressItem*)item
                     withAddress:(autofill::AutofillProfile*)address {
-  item.name =
-      base::SysUTF16ToNSString(address->GetRawInfo(autofill::NAME_FULL));
-  item.address =
-      payment_request_utils::AddressLabelFromAutofillProfile(address);
-  item.phoneNumber = base::SysUTF16ToNSString(
-      address->GetRawInfo(autofill::PHONE_HOME_WHOLE_NUMBER));
+  item.name = NameLabelFromAutofillProfile(address);
+  item.address = AddressLabelFromAutofillProfile(address);
+  item.phoneNumber = PhoneNumberLabelFromAutofillProfile(address);
 }
 
 #pragma mark UICollectionViewDataSource