Revamp desktop Autofill settings, round 2

components/autofill/core/browser/credit_card_unittest.cc

 // Copyright 2013 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.
 
 #include "base/basictypes.h"
 #include "base/guid.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_test_utils.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/credit_card.h"
@@ skipping 103 matching lines @@
                 "5100"),
             obfuscated3);
 
   // Case 4: Have everything.
   CreditCard credit_card4(base::GenerateGUID(), "https://www.example.com/");
   test::SetCreditCardInfo(
       &credit_card4, "John Dillinger", "5105 1051 0510 5100", "01", "2010");
   base::string16 summary4 = credit_card4.Label();
   EXPECT_EQ(UTF8ToUTF16(
                 "MasterCard \xE2\x8B\xAF"
-                "5100, Exp: 01/2010"),
+                "5100, 01/2010"),
             summary4);
   base::string16 obfuscated4 = credit_card4.TypeAndLastFourDigits();
   EXPECT_EQ(UTF8ToUTF16(
                 "MasterCard \xE2\x8B\xAF"
                 "5100"),
             obfuscated4);
 
   // Case 5: Very long credit card
   CreditCard credit_card5(base::GenerateGUID(), "https://www.example.com/");
   test::SetCreditCardInfo(
       &credit_card5,
       "John Dillinger",
       "0123456789 0123456789 0123456789 5105 1051 0510 5100", "01", "2010");
   base::string16 summary5 = credit_card5.Label();
   EXPECT_EQ(UTF8ToUTF16(
                 "Card \xE2\x8B\xAF"
-                "5100, Exp: 01/2010"),
+                "5100, 01/2010"),
             summary5);
   base::string16 obfuscated5 = credit_card5.TypeAndLastFourDigits();
   EXPECT_EQ(UTF8ToUTF16(
                 "Card \xE2\x8B\xAF"
                 "5100"),
             obfuscated5);
 }
 
 TEST(CreditCardTest, AssignmentOperator) {
   CreditCard a(base::GenerateGUID(), "some origin");
@@ skipping 500 matching lines @@
   base::string16 card_number = base::ASCIIToUTF16("test");
   int month = 1;
   int year = 3000;
   CreditCard card(card_number, month, year);
   EXPECT_EQ(card_number, card.number());
   EXPECT_EQ(month, card.expiration_month());
   EXPECT_EQ(year, card.expiration_year());
 }
 
 }  // namespace autofill