[Payment Request] Replacing more iOS strings with components strings

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"
 
 #include "base/mac/foundation_util.h"
 
 #include "base/strings/sys_string_conversions.h"
 #include "components/autofill/core/browser/autofill_profile.h"
@@ skipping 91 matching lines @@
 
 - (void)loadModel {
   [super loadModel];
   CollectionViewModel* model = self.collectionViewModel;
   _selectedItem = nil;
 
   [model addSectionWithIdentifier:SectionIdentifierShippingAddress];
 
   if (_pending) {
     StatusItem* statusItem = [[StatusItem alloc] initWithType:ItemTypeSpinner];
-    statusItem.text =
-        l10n_util::GetNSString(IDS_IOS_PAYMENT_REQUEST_CHECKING_LABEL);
+    statusItem.text = l10n_util::GetNSString(IDS_PAYMENTS_CHECKING_OPTION);
     [model addItem:statusItem
         toSectionWithIdentifier:SectionIdentifierShippingAddress];
     return;
   }
 
   PaymentsTextItem* messageItem =
       [[PaymentsTextItem alloc] initWithType:ItemTypeMessage];
   if (_errorMessage) {
     messageItem.text = _errorMessage;
     messageItem.image = NativeImage(IDR_IOS_PAYMENTS_WARNING);
@@ skipping 15 matching lines @@
     if (_paymentRequest->selected_shipping_profile() == shippingAddress) {
       item.accessoryType = MDCCollectionViewCellAccessoryCheckmark;
       _selectedItem = item;
     }
     [model addItem:item
         toSectionWithIdentifier:SectionIdentifierShippingAddress];
   }
 
   PaymentsTextItem* addShippingAddress =
       [[PaymentsTextItem alloc] initWithType:ItemTypeAddShippingAddress];
-  addShippingAddress.text = l10n_util::GetNSString(
-      IDS_IOS_PAYMENT_REQUEST_SHIPPING_ADDRESS_SELECTION_ADD_BUTTON);
+  addShippingAddress.text = l10n_util::GetNSString(IDS_PAYMENTS_ADD_ADDRESS);
   addShippingAddress.image = NativeImage(IDR_IOS_PAYMENTS_ADD);
   addShippingAddress.accessibilityTraits |= UIAccessibilityTraitButton;
   [model addItem:addShippingAddress
       toSectionWithIdentifier:SectionIdentifierShippingAddress];
 }
 
 - (void)viewDidLoad {
   [super viewDidLoad];
   self.collectionView.accessibilityIdentifier =
       kShippingAddressSelectionCollectionViewID;
@@ skipping 96 matching lines @@
     hidesInkViewAtIndexPath:(NSIndexPath*)indexPath {
   NSInteger type = [self.collectionViewModel itemTypeForIndexPath:indexPath];
   if (type == ItemTypeMessage) {
     return YES;
   } else {
     return NO;
   }
 }
 
 @end