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

ios/chrome/browser/ui/payments/payment_request_view_controller_unittest.mm

 // Copyright 2017 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/memory/ptr_util.h"
-#include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/autofill_test_utils.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/test_personal_data_manager.h"
 #include "components/strings/grit/components_strings.h"
 #include "ios/chrome/browser/payments/payment_request.h"
 #include "ios/chrome/browser/payments/payment_request_test_util.h"
 #import "ios/chrome/browser/ui/autofill/cells/status_item.h"
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_detail_item.h"
 #import "ios/chrome/browser/ui/collection_view/collection_view_controller_test.h"
 #import "ios/chrome/browser/ui/payments/cells/autofill_profile_item.h"
 #import "ios/chrome/browser/ui/payments/cells/page_info_item.h"
 #import "ios/chrome/browser/ui/payments/cells/payment_method_item.h"
 #import "ios/chrome/browser/ui/payments/cells/payments_text_item.h"
 #import "ios/chrome/browser/ui/payments/cells/price_item.h"
 #include "ios/chrome/grit/ios_strings.h"
 #include "ios/web/public/payments/payment_request.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/l10n/l10n_util.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 class PaymentRequestViewControllerTest : public CollectionViewControllerTest {
  protected:
   PaymentRequestViewControllerTest()
       : autofill_profile_(autofill::test::GetFullProfile()),
         credit_card_(autofill::test::GetCreditCard()) {
@@ skipping 157 matching lines @@
   [GetPaymentRequestViewController() loadModel];
 
   ASSERT_EQ(1, NumberOfSections());
   // There should be only one item.
   ASSERT_EQ(1U, static_cast<unsigned int>(NumberOfItemsInSection(0)));
 
   // The item should be of type StatusItem.
   id item = GetCollectionViewItem(0, 0);
   EXPECT_TRUE([item isMemberOfClass:[StatusItem class]]);
 }
-
-TEST_F(PaymentRequestViewControllerTest, TestSignedInStringFormatting) {
-  const std::string unformattedString = l10n_util::GetStringUTF8(
-      IDS_PAYMENTS_CARD_AND_ADDRESS_SETTINGS_SIGNED_IN);
-  const std::string formattedString = l10n_util::GetStringFUTF8(
-      IDS_PAYMENTS_CARD_AND_ADDRESS_SETTINGS_SIGNED_IN,
-      base::ASCIIToUTF16("example@gmail.com"));
-
-  EXPECT_NE(unformattedString, formattedString);
-}