rAc: try really hard not to ellipsize addresses

chrome/browser/ui/autofill/data_model_wrapper_unittest.cc

Index: chrome/browser/ui/autofill/data_model_wrapper_unittest.cc
diff --git a/chrome/browser/ui/autofill/data_model_wrapper_unittest.cc b/chrome/browser/ui/autofill/data_model_wrapper_unittest.cc
index 724548a36030b85a59183a37b40c1f8bde198eb8..f8b750f27795336843860101b4946ca6d21f7b02 100644
--- a/chrome/browser/ui/autofill/data_model_wrapper_unittest.cc
+++ b/chrome/browser/ui/autofill/data_model_wrapper_unittest.cc
@@ -34,7 +34,8 @@ TEST(AutofillCreditCardWrapperTest, GetDisplayTextEmptyWhenExpired) {
   card.SetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR, ASCIIToUTF16("2010"));
   card.SetRawInfo(CREDIT_CARD_NUMBER, ASCIIToUTF16("4111111111111111"));
   AutofillCreditCardWrapper wrapper(&card);
-  EXPECT_TRUE(wrapper.GetDisplayText().empty());
+  base::string16 unused, unused2;
+  EXPECT_FALSE(wrapper.GetDisplayText(&unused, &unused2));
 }
 
 TEST(AutofillCreditCardWrapperTest, GetDisplayTextEmptyWhenInvalid) {
@@ -43,7 +44,8 @@ TEST(AutofillCreditCardWrapperTest, GetDisplayTextEmptyWhenInvalid) {
   card.SetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR, ASCIIToUTF16("9999"));
   card.SetRawInfo(CREDIT_CARD_NUMBER, ASCIIToUTF16("41111"));
   AutofillCreditCardWrapper wrapper(&card);
-  EXPECT_TRUE(wrapper.GetDisplayText().empty());
+  base::string16 unused, unused2;
+  EXPECT_FALSE(wrapper.GetDisplayText(&unused, &unused2));
 }
 
 TEST(AutofillCreditCardWrapperTest, GetDisplayTextNotEmptyWhenValid) {
@@ -52,7 +54,8 @@ TEST(AutofillCreditCardWrapperTest, GetDisplayTextNotEmptyWhenValid) {
   card.SetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR, ASCIIToUTF16("9999"));
   card.SetRawInfo(CREDIT_CARD_NUMBER, ASCIIToUTF16("4111111111111111"));
   AutofillCreditCardWrapper wrapper(&card);
-  EXPECT_FALSE(wrapper.GetDisplayText().empty());
+  base::string16 unused, unused2;
+  EXPECT_TRUE(wrapper.GetDisplayText(&unused, &unused2));
 }
 
 TEST(WalletInstrumentWrapperTest, GetInfoCreditCardExpMonth) {
@@ -72,7 +75,8 @@ TEST(WalletInstrumentWrapperTest, GetDisplayTextEmptyWhenExpired) {
       wallet::GetTestMaskedInstrument());
   instrument->status_ = wallet::WalletItems::MaskedInstrument::EXPIRED;
   WalletInstrumentWrapper wrapper(instrument.get());
-  EXPECT_TRUE(wrapper.GetDisplayText().empty());
+  base::string16 unused, unused2;
+  EXPECT_FALSE(wrapper.GetDisplayText(&unused, &unused2));
 }
 
 TEST(DataModelWrapperTest, GetDisplayTextEmptyWithoutPhone) {
@@ -80,10 +84,11 @@ TEST(DataModelWrapperTest, GetDisplayTextEmptyWithoutPhone) {
       wallet::GetTestMaskedInstrument());
 
   WalletInstrumentWrapper instrument_wrapper(instrument.get());
-  ASSERT_FALSE(instrument_wrapper.GetDisplayText().empty());
+  base::string16 unused, unused2;
+  ASSERT_TRUE(instrument_wrapper.GetDisplayText(&unused, &unused2));
 
   WalletAddressWrapper address_wrapper(&instrument->address());
-  ASSERT_FALSE(address_wrapper.GetDisplayText().empty());
+  ASSERT_TRUE(address_wrapper.GetDisplayText(&unused, &unused2));
 
   const_cast<wallet::Address*>(&instrument->address())->set_phone_number(
       string16());
@@ -91,11 +96,11 @@ TEST(DataModelWrapperTest, GetDisplayTextEmptyWithoutPhone) {
   ASSERT_TRUE(
       instrument_wrapper.GetInfo(
           AutofillType(PHONE_HOME_WHOLE_NUMBER)).empty());
-  EXPECT_TRUE(instrument_wrapper.GetDisplayText().empty());
+  EXPECT_FALSE(instrument_wrapper.GetDisplayText(&unused, &unused2));
 
   ASSERT_TRUE(
       address_wrapper.GetInfo(AutofillType(PHONE_HOME_WHOLE_NUMBER)).empty());
-  EXPECT_TRUE(address_wrapper.GetDisplayText().empty());
+  EXPECT_FALSE(address_wrapper.GetDisplayText(&unused, &unused2));
 }
 
 }  // namespace autofill