Fixes formatting of the signed-in setting string on iOS.

ios/chrome/browser/ui/payments/payment_request_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/ui/payments/payment_request_view_controller.h"
 
 #include "base/mac/foundation_util.h"
 
 #include "base/strings/stringprintf.h"

[please use gerrit instead, 2017/05/25 19:42:44]

Remove.

[macourteau, 2017/05/25 19:53:47]

Done.

 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_data_util.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #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/payments/core/currency_formatter.h"
 #include "components/payments/core/strings_util.h"
 #include "components/strings/grit/components_strings.h"
@@ skipping 350 matching lines @@
       toSectionWithIdentifier:SectionIdentifierContactInfo];
 
   // Footer Text section.
   [model addSectionWithIdentifier:SectionIdentifierFooter];
   CollectionViewFooterItem* footer =
       [[CollectionViewFooterItem alloc] initWithType:ItemTypeFooterText];
   if (!_showPaymentDataSource) {
     footer.text =
         l10n_util::GetNSString(IDS_PAYMENTS_CARD_AND_ADDRESS_SETTINGS);
   } else if ([[_dataSource authenticatedAccountName] length]) {
-    const std::string unformattedString = l10n_util::GetStringUTF8(
-        IDS_PAYMENTS_CARD_AND_ADDRESS_SETTINGS_SIGNED_IN);
-    const std::string accountName =
-        base::SysNSStringToUTF8([_dataSource authenticatedAccountName]);
-    const std::string formattedString =
-        base::StringPrintf(unformattedString.c_str(), accountName.c_str());
+    const base::string16 accountName =
+        base::SysNSStringToUTF16([_dataSource authenticatedAccountName]);

[please use gerrit instead, 2017/05/25 19:42:44]

I would be more comfortable with using std::string here as well (via
base::SysNSStringToUTF8).

[macourteau, 2017/05/25 19:53:47]

There's no variant of GetStringFUTF8 that takes an std::string:
https://cs.chromium.org/chromium/src/ui/base/l10n/l10n_util.h?l=138

+    const std::string formattedString = l10n_util::GetStringFUTF8(
+        IDS_PAYMENTS_CARD_AND_ADDRESS_SETTINGS_SIGNED_IN, accountName);
     footer.text = base::SysUTF8ToNSString(formattedString);
   } else {
     footer.text = l10n_util::GetNSString(
         IDS_PAYMENTS_CARD_AND_ADDRESS_SETTINGS_SIGNED_OUT);
   }
   footer.linkURL = GURL(kSettingsURL);
   footer.linkDelegate = self;
   [model addItem:footer toSectionWithIdentifier:SectionIdentifierFooter];
 }
 
@@ skipping 225 matching lines @@
 
 - (BOOL)collectionView:(UICollectionView*)collectionView
     shouldHideItemBackgroundAtIndexPath:(NSIndexPath*)indexPath {
   // No background on the footer text item.
   NSInteger sectionIdentifier =
       [self.collectionViewModel sectionIdentifierForSection:indexPath.section];
   return sectionIdentifier == SectionIdentifierFooter ? YES : NO;
 }
 
 @end