Revert of 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 2be5dc7c276dfb7f6cd12df9532195c53dd42854..6e9a14ea6833adf17a722387c52fcaa4cd46283d 100644
--- a/ios/chrome/browser/payments/payment_request_view_controller.mm
+++ b/ios/chrome/browser/payments/payment_request_view_controller.mm
@@ -14,7 +14,6 @@
 #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"
@@ -35,10 +34,6 @@
 #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";
 
@@ -116,8 +111,6 @@
       NSForegroundColorAttributeName : [UIColor lightGrayColor]
     }
                                  forState:UIControlStateDisabled];
-    [_cancelButton
-        setAccessibilityLabel:l10n_util::GetNSString(IDS_ACCNAME_CANCEL)];
     [self navigationItem].leftBarButtonItem = _cancelButton;
 
     // Set up right (pay) button.
@@ -355,9 +348,12 @@
 
 - (void)fillShippingAddressItem:(ShippingAddressItem*)item
                     withAddress:(autofill::AutofillProfile*)address {
-  item.name = NameLabelFromAutofillProfile(address);
-  item.address = AddressLabelFromAutofillProfile(address);
-  item.phoneNumber = PhoneNumberLabelFromAutofillProfile(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));
 }
 
 - (void)fillShippingOptionItem:(CollectionViewTextItem*)item