1 files changed, 21 insertions, 1 deletions
diff --git a/components/autofill/browser/wallet/wallet_test_util.cc b/components/autofill/browser/wallet/wallet_test_util.cc
index 22a05af..f4f1dc0 100644
--- a/components/autofill/browser/wallet/wallet_test_util.cc
+++ b/components/autofill/browser/wallet/wallet_test_util.cc
@@ -30,6 +30,7 @@ int FutureYear() {
 
 scoped_ptr<WalletItems::MaskedInstrument> GetTestMaskedInstrumentWithDetails(
     const std::string& id,
+    scoped_ptr<Address> address,
     WalletItems::MaskedInstrument::Type type,
     WalletItems::MaskedInstrument::Status status) {
   return scoped_ptr<WalletItems::MaskedInstrument>(
@@ -39,7 +40,7 @@ scoped_ptr<WalletItems::MaskedInstrument> GetTestMaskedInstrumentWithDetails(
                                         ASCIIToUTF16("1111"),
                                         12,
                                         FutureYear(),
-                                        GetTestAddress(),
+                                        address.Pass(),
                                         status,
                                         id));
 }
@@ -48,6 +49,17 @@ scoped_ptr<WalletItems::MaskedInstrument> GetTestMaskedInstrumentWithId(
     const std::string& id) {
   return GetTestMaskedInstrumentWithDetails(
       id,
+      GetTestAddress(),
+      WalletItems::MaskedInstrument::VISA,
+      WalletItems::MaskedInstrument::VALID);
+}
+
+scoped_ptr<WalletItems::MaskedInstrument>
+GetTestMaskedInstrumentWithIdAndAddress(
+    const std::string& id, scoped_ptr<Address> address) {
+  return GetTestMaskedInstrumentWithDetails(
+      id,
+      address.Pass(),
       WalletItems::MaskedInstrument::VISA,
       WalletItems::MaskedInstrument::VALID);
 }
@@ -64,6 +76,12 @@ scoped_ptr<Address> GetTestAddress() {
                                          std::string()));
 }
 
+scoped_ptr<Address> GetTestMinimalAddress() {
+  scoped_ptr<Address> address = GetTestAddress();
+  address->set_is_complete_address(false);
+  return address.Pass();
+}
+
 scoped_ptr<FullWallet> GetTestFullWallet() {
   base::Time::Exploded exploded;
   base::Time::Now().LocalExplode(&exploded);
@@ -99,6 +117,7 @@ scoped_ptr<WalletItems::MaskedInstrument> GetTestMaskedInstrument() {
 scoped_ptr<WalletItems::MaskedInstrument> GetTestMaskedInstrumentInvalid() {
   return GetTestMaskedInstrumentWithDetails(
       "default_instrument_id",
+      GetTestAddress(),
       WalletItems::MaskedInstrument::VISA,
       WalletItems::MaskedInstrument::DECLINED);
 }
@@ -106,6 +125,7 @@ scoped_ptr<WalletItems::MaskedInstrument> GetTestMaskedInstrumentInvalid() {
 scoped_ptr<WalletItems::MaskedInstrument> GetTestMaskedInstrumentAmex() {
   return GetTestMaskedInstrumentWithDetails(
       "default_instrument_id",
+      GetTestAddress(),
       WalletItems::MaskedInstrument::AMEX,
       WalletItems::MaskedInstrument::VALID);
 }