Revert of EarlGrey tests for Payment Request (base CL)

ios/chrome/browser/payments/shipping_address_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/shipping_address_selection_view_controller.h"
 
 #import "base/ios/weak_nsobject.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/strings/grit/components_strings.h"
 #include "ios/chrome/browser/application_context.h"
 #import "ios/chrome/browser/payments/cells/shipping_address_item.h"
 #import "ios/chrome/browser/payments/payment_request_utils.h"
 #import "ios/chrome/browser/ui/collection_view/cells/MDCCollectionViewCell+Chrome.h"
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_text_item.h"
 #import "ios/chrome/browser/ui/collection_view/collection_view_model.h"
 #import "ios/chrome/browser/ui/icons/chrome_icon.h"
 #include "ios/chrome/grit/ios_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
-using payment_request_utils::NameLabelFromAutofillProfile;
-using payment_request_utils::AddressLabelFromAutofillProfile;
-using payment_request_utils::PhoneNumberLabelFromAutofillProfile;
-
 NSString* const kShippingAddressSelectionCollectionViewId =
     @"kShippingAddressSelectionCollectionViewId";
 
 namespace {
 
 const CGFloat kSeparatorEdgeInset = 14;
 
 typedef NS_ENUM(NSInteger, SectionIdentifier) {
   SectionIdentifierShippingAddress = kSectionIdentifierEnumZero,
 };
@@ skipping 56 matching lines @@
 - (void)loadModel {
   [super loadModel];
   CollectionViewModel* model = self.collectionViewModel;
 
   [model addSectionWithIdentifier:SectionIdentifierShippingAddress];
 
   for (size_t i = 0; i < _shippingAddresses.size(); ++i) {
     autofill::AutofillProfile* shippingAddress = _shippingAddresses[i];
     ShippingAddressItem* item = [[[ShippingAddressItem alloc]
         initWithType:ItemTypeShippingAddress] autorelease];
-    item.accessibilityTraits |= UIAccessibilityTraitButton;
-    item.name = NameLabelFromAutofillProfile(shippingAddress);
-    item.address = AddressLabelFromAutofillProfile(shippingAddress);
-    item.phoneNumber = PhoneNumberLabelFromAutofillProfile(shippingAddress);
+    item.name = base::SysUTF16ToNSString(
+        shippingAddress->GetRawInfo(autofill::NAME_FULL));
+    item.address =
+        payment_request_utils::AddressLabelFromAutofillProfile(shippingAddress);
+    item.phoneNumber = base::SysUTF16ToNSString(
+        shippingAddress->GetRawInfo(autofill::PHONE_HOME_WHOLE_NUMBER));
     if (shippingAddress == _selectedShippingAddress) {
       item.accessoryType = MDCCollectionViewCellAccessoryCheckmark;
       _selectedItem = item;
     }
 
     [model addItem:item
         toSectionWithIdentifier:SectionIdentifierShippingAddress];
   }
 
   CollectionViewTextItem* addShippingAddress = [[[CollectionViewTextItem alloc]
@@ skipping 65 matching lines @@
   } else {
     CollectionViewItem* item =
         [self.collectionViewModel itemAtIndexPath:indexPath];
     return [MDCCollectionViewCell
         cr_preferredHeightForWidth:CGRectGetWidth(collectionView.bounds)
                            forItem:item];
   }
 }
 
 @end