Handle expired Autofill credit cards in autofill dialog

components/autofill/browser/wallet/instrument_unittest.cc

 // Copyright (c) 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/utf_string_conversions.h"
 #include "base/values.h"
 #include "components/autofill/browser/wallet/instrument.h"
 #include "components/autofill/browser/wallet/wallet_address.h"
 #include "components/autofill/browser/wallet/wallet_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 142 matching lines @@
   EXPECT_FALSE(instrument.IsValid());
 }
 
 TEST(Instrument, ToDictionary) {
   base::DictionaryValue expected;
   expected.SetString("type", "CREDIT_CARD");
   expected.SetInteger("credit_card.exp_month", 12);
   expected.SetInteger("credit_card.exp_year", 2015);
   expected.SetString("credit_card.last_4_digits", kLastFourDigits);
   expected.SetString("credit_card.fop_type", "VISA");
-  expected.SetString("credit_card.address.country_name_code",
-                     "ship_country_name_code");
+  expected.SetString("credit_card.address.country_name_code", "US");
   expected.SetString("credit_card.address.recipient_name",
                      "ship_recipient_name");
   expected.SetString("credit_card.address.locality_name",
                      "ship_locality_name");
   expected.SetString("credit_card.address.administrative_area_name",
                      "ship_admin_area_name");
   expected.SetString("credit_card.address.postal_code_number",
                      "ship_postal_code_number");
   base::ListValue* address_lines = new base::ListValue();
   address_lines->AppendString("ship_address_line_1");
   address_lines->AppendString("ship_address_line_2");
   expected.Set("credit_card.address.address_line", address_lines);
 
   Instrument instrument(ASCIIToUTF16(kPrimaryAccountNumber),
                         ASCIIToUTF16(kCardVerificationNumber),
                         12,
                         2015,
                         Instrument::VISA,
                         GetTestShippingAddress().Pass());
 
   EXPECT_TRUE(expected.Equals(instrument.ToDictionary().get()));
 }
 
 }  // namespace wallet
 }  // namespace autofill