Handle invalid instrument and AMEX from wallet in autofill dialog.

BUG=233048

Review URL: https://chromiumcodereview.appspot.com/15216003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201673 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 32 insertions, 6 deletions

diff --git a/components/autofill/browser/wallet/wallet_items.h b/components/autofill/browser/wallet/wallet_items.h
index 14c4521..f9707da 100644
--- a/components/autofill/browser/wallet/wallet_items.h
+++ b/components/autofill/browser/wallet/wallet_items.h
@@ -108,8 +108,8 @@ class WalletItems {
 
    private:
     friend class WalletItemsTest;
-    friend scoped_ptr<MaskedInstrument> GetTestMaskedInstrumentWithId(
-        const std::string&);
+    friend scoped_ptr<MaskedInstrument> GetTestMaskedInstrumentWithDetails(
+        const std::string&, Type type, Status status);
     FRIEND_TEST_ALL_PREFIXES(::autofill::WalletInstrumentWrapperTest,
                              GetInfoCreditCardExpMonth);
     FRIEND_TEST_ALL_PREFIXES(::autofill::WalletInstrumentWrapperTest,
diff --git a/components/autofill/browser/wallet/wallet_test_util.cc b/components/autofill/browser/wallet/wallet_test_util.cc
index f34e82a..22a05af 100644
--- a/components/autofill/browser/wallet/wallet_test_util.cc
+++ b/components/autofill/browser/wallet/wallet_test_util.cc
@@ -28,20 +28,30 @@ int FutureYear() {
 
 }  // namespace
 
-scoped_ptr<WalletItems::MaskedInstrument> GetTestMaskedInstrumentWithId(
-    const std::string& id) {
+scoped_ptr<WalletItems::MaskedInstrument> GetTestMaskedInstrumentWithDetails(
+    const std::string& id,
+    WalletItems::MaskedInstrument::Type type,
+    WalletItems::MaskedInstrument::Status status) {
   return scoped_ptr<WalletItems::MaskedInstrument>(
       new WalletItems::MaskedInstrument(ASCIIToUTF16("descriptive_name"),
-                                        WalletItems::MaskedInstrument::VISA,
+                                        type,
                                         std::vector<base::string16>(),
                                         ASCIIToUTF16("1111"),
                                         12,
                                         FutureYear(),
                                         GetTestAddress(),
-                                        WalletItems::MaskedInstrument::VALID,
+                                        status,
                                         id));
 }
 
+scoped_ptr<WalletItems::MaskedInstrument> GetTestMaskedInstrumentWithId(
+    const std::string& id) {
+  return GetTestMaskedInstrumentWithDetails(
+      id,
+      WalletItems::MaskedInstrument::VISA,
+      WalletItems::MaskedInstrument::VALID);
+}
+
 scoped_ptr<Address> GetTestAddress() {
   return scoped_ptr<Address>(new Address("US",
                                          ASCIIToUTF16("recipient_name"),
@@ -86,6 +96,20 @@ scoped_ptr<WalletItems::MaskedInstrument> GetTestMaskedInstrument() {
   return GetTestMaskedInstrumentWithId("default_instrument_id");
 }
 
+scoped_ptr<WalletItems::MaskedInstrument> GetTestMaskedInstrumentInvalid() {
+  return GetTestMaskedInstrumentWithDetails(
+      "default_instrument_id",
+      WalletItems::MaskedInstrument::VISA,
+      WalletItems::MaskedInstrument::DECLINED);
+}
+
+scoped_ptr<WalletItems::MaskedInstrument> GetTestMaskedInstrumentAmex() {
+  return GetTestMaskedInstrumentWithDetails(
+      "default_instrument_id",
+      WalletItems::MaskedInstrument::AMEX,
+      WalletItems::MaskedInstrument::VALID);
+}
+
 scoped_ptr<WalletItems::MaskedInstrument> GetTestNonDefaultMaskedInstrument() {
   return GetTestMaskedInstrumentWithId("instrument_id");
 }
diff --git a/components/autofill/browser/wallet/wallet_test_util.h b/components/autofill/browser/wallet/wallet_test_util.h
index 316c5d7..75f4e56 100644
--- a/components/autofill/browser/wallet/wallet_test_util.h
+++ b/components/autofill/browser/wallet/wallet_test_util.h
@@ -20,6 +20,8 @@ scoped_ptr<FullWallet> GetTestFullWallet();
 scoped_ptr<Instrument> GetTestInstrument();
 scoped_ptr<WalletItems::LegalDocument> GetTestLegalDocument();
 scoped_ptr<WalletItems::MaskedInstrument> GetTestMaskedInstrument();
+scoped_ptr<WalletItems::MaskedInstrument> GetTestMaskedInstrumentInvalid();
+scoped_ptr<WalletItems::MaskedInstrument> GetTestMaskedInstrumentAmex();
 scoped_ptr<WalletItems::MaskedInstrument> GetTestNonDefaultMaskedInstrument();
 scoped_ptr<Address> GetTestSaveableAddress();
 scoped_ptr<Address> GetTestShippingAddress();