Revert of EarlGrey tests for Payment Request (base CL)

ios/chrome/browser/payments/payment_method_selection_view_controller.mm

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/chrome/browser/payments/payment_method_selection_view_controller.h"
 
 #import "base/ios/weak_nsobject.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/autofill/core/browser/autofill_data_util.h"
@@ skipping 44 matching lines @@
 
 - (instancetype)init {
   if ((self = [super initWithStyle:CollectionViewControllerStyleAppBar])) {
     [self setTitle:l10n_util::GetNSString(
                        IDS_IOS_PAYMENT_REQUEST_METHOD_SELECTION_TITLE)];
 
     UIBarButtonItem* returnButton =
         [ChromeIcon templateBarButtonItemWithImage:[ChromeIcon backIcon]
                                             target:nil
                                             action:@selector(onReturn)];
-    returnButton.accessibilityLabel = l10n_util::GetNSString(IDS_ACCNAME_BACK);
     [self navigationItem].leftBarButtonItem = returnButton;
   }
   return self;
 }
 
 - (id<PaymentMethodSelectionViewControllerDelegate>)delegate {
   return _delegate.get();
 }
 
 - (void)setDelegate:(id<PaymentMethodSelectionViewControllerDelegate>)delegate {
   _delegate.reset(delegate);
 }
 
 - (void)onReturn {
   [_delegate paymentMethodSelectionViewControllerDidReturn:self];
 }
 
 #pragma mark - CollectionViewController methods
 
 - (void)loadModel {
   [super loadModel];
   CollectionViewModel* model = self.collectionViewModel;
 
   [model addSectionWithIdentifier:SectionIdentifierPayment];
 
   for (size_t i = 0; i < _paymentMethods.size(); ++i) {
     autofill::CreditCard* paymentMethod = _paymentMethods[i];
     PaymentMethodItem* paymentMethodItem = [[[PaymentMethodItem alloc]
         initWithType:ItemTypePaymentMethod] autorelease];
-    paymentMethodItem.accessibilityTraits |= UIAccessibilityTraitButton;
     paymentMethodItem.methodID =
         base::SysUTF16ToNSString(paymentMethod->TypeAndLastFourDigits());
     paymentMethodItem.methodDetail = base::SysUTF16ToNSString(
         paymentMethod->GetRawInfo(autofill::CREDIT_CARD_NAME_FULL));
 
     int methodTypeIconID =
         autofill::data_util::GetPaymentRequestData(paymentMethod->type())
             .icon_resource_id;
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     paymentMethodItem.methodTypeIcon =
@@ skipping 48 matching lines @@
 - (CGFloat)collectionView:(UICollectionView*)collectionView
     cellHeightAtIndexPath:(NSIndexPath*)indexPath {
   NSInteger type = [self.collectionViewModel itemTypeForIndexPath:indexPath];
   if (type == ItemTypeAddMethod)
     return MDCCellDefaultOneLineHeight;
   else
     return MDCCellDefaultTwoLineHeight;
 }
 
 @end