Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(129)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/autofill/content/browser/wallet/wallet_test_util.cc

Issue 100743006: Fix DCHECK() when updating instruments with no phone number. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: dcheck Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« components/autofill/content/browser/wallet/wallet_client.cc ('K') | « components/autofill/content/browser/wallet/wallet_client_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/autofill/content/browser/wallet/wallet_test_util.cc
diff --git a/components/autofill/content/browser/wallet/wallet_test_util.cc b/components/autofill/content/browser/wallet/wallet_test_util.cc
index e33a72ad92377ae6ec87a4e9869fe7b1cf803354..0973288da8f513e55ebe6278b5a2a232d133eeba 100644
--- a/components/autofill/content/browser/wallet/wallet_test_util.cc
+++ b/components/autofill/content/browser/wallet/wallet_test_util.cc
@@ -34,7 +34,7 @@ scoped_ptr<WalletItems::MaskedInstrument> GetTestMaskedInstrumentWithDetails(
scoped_ptr<Address> address,
WalletItems::MaskedInstrument::Type type,
WalletItems::MaskedInstrument::Status status) {
- return scoped_ptr<WalletItems::MaskedInstrument>(
+ return make_scoped_ptr(
new WalletItems::MaskedInstrument(ASCIIToUTF16("descriptive_name"),
type,
std::vector<base::string16>(),
@@ -66,20 +66,22 @@ GetTestMaskedInstrumentWithIdAndAddress(
}
scoped_ptr<GaiaAccount> GetTestGaiaAccount() {
- return scoped_ptr<GaiaAccount>(GaiaAccount::CreateForTesting(
- "user@chromium.org", "obfuscated_id", 0, true));
+ return GaiaAccount::CreateForTesting("user@chromium.org",
+ "obfuscated_id",
+ 0,
+ true);
}
scoped_ptr<Address> GetTestAddress() {
- return scoped_ptr<Address>(new Address("US",
- ASCIIToUTF16("recipient_name"),
- ASCIIToUTF16("address_line_1"),
- ASCIIToUTF16("address_line_2"),
- ASCIIToUTF16("locality_name"),
- ASCIIToUTF16("admin_area_name"),
- ASCIIToUTF16("postal_code_number"),
- ASCIIToUTF16("phone_number"),
- std::string()));
+ return make_scoped_ptr(new Address("US",
+ ASCIIToUTF16("recipient_name"),
+ ASCIIToUTF16("address_line_1"),
+ ASCIIToUTF16("address_line_2"),
+ ASCIIToUTF16("locality_name"),
+ ASCIIToUTF16("admin_area_name"),
+ ASCIIToUTF16("postal_code_number"),
+ ASCIIToUTF16("phone_number"),
+ std::string()));
}
scoped_ptr<Address> GetTestMinimalAddress() {
@@ -122,45 +124,39 @@ scoped_ptr<FullWallet> GetTestFullWalletInstrumentOnly() {
}
scoped_ptr<Instrument> GetTestInstrument() {
- return scoped_ptr<Instrument>(new Instrument(ASCIIToUTF16("4444444444444448"),
- ASCIIToUTF16("123"),
- 12,
- FutureYear(),
- Instrument::VISA,
- GetTestAddress()));
+ return make_scoped_ptr(new Instrument(ASCIIToUTF16("4444444444444448"),
+ ASCIIToUTF16("123"),
+ 12,
+ FutureYear(),
+ Instrument::VISA,
+ GetTestAddress()));
}
scoped_ptr<Instrument> GetTestAddressUpgradeInstrument() {
- scoped_ptr<Instrument> instrument(new Instrument(base::string16(),
- base::string16(),
- 0,
- 0,
- Instrument::UNKNOWN,
- GetTestAddress()));
- instrument->set_object_id("instrument_id");
- return instrument.Pass();
+ return make_scoped_ptr(new Instrument(base::string16(),
+ base::string16(),
+ 12,
+ FutureYear(),
+ Instrument::UNKNOWN,
+ GetTestAddress()));
}
scoped_ptr<Instrument> GetTestExpirationDateChangeInstrument() {
- scoped_ptr<Instrument> instrument(new Instrument(base::string16(),
- ASCIIToUTF16("123"),
- 12,
- FutureYear(),
- Instrument::UNKNOWN,
- scoped_ptr<Address>()));
- instrument->set_object_id("instrument_id");
- return instrument.Pass();
+ return make_scoped_ptr(new Instrument(base::string16(),
+ ASCIIToUTF16("123"),
+ 12,
+ FutureYear() + 1,
+ Instrument::UNKNOWN,
+ scoped_ptr<Address>()));
}
scoped_ptr<Instrument> GetTestAddressNameChangeInstrument() {
- scoped_ptr<Instrument> instrument(new Instrument(base::string16(),
- ASCIIToUTF16("123"),
- 0,
- 0,
- Instrument::UNKNOWN,
- GetTestAddress()));
- instrument->set_object_id("instrument_id");
- return instrument.Pass();
+ return make_scoped_ptr(new Instrument(base::string16(),
+ ASCIIToUTF16("123"),
+ 12,
+ FutureYear(),
+ Instrument::UNKNOWN,
+ GetTestAddress()));
}
scoped_ptr<WalletItems::LegalDocument> GetTestLegalDocument() {
@@ -196,9 +192,9 @@ scoped_ptr<WalletItems::MaskedInstrument> GetTestMaskedInstrumentAmex(
"default_instrument_id",
GetTestAddress(),
WalletItems::MaskedInstrument::AMEX,
- (amex_permission == AMEX_ALLOWED)
- ? WalletItems::MaskedInstrument::VALID
- : WalletItems::MaskedInstrument::AMEX_NOT_SUPPORTED);
+ amex_permission == AMEX_ALLOWED ?
+ WalletItems::MaskedInstrument::VALID :
+ WalletItems::MaskedInstrument::AMEX_NOT_SUPPORTED);
}
scoped_ptr<WalletItems::MaskedInstrument> GetTestNonDefaultMaskedInstrument() {
@@ -206,29 +202,27 @@ scoped_ptr<WalletItems::MaskedInstrument> GetTestNonDefaultMaskedInstrument() {
}
scoped_ptr<Address> GetTestSaveableAddress() {
- return scoped_ptr<Address>(new Address(
- "US",
- ASCIIToUTF16("save_recipient_name"),
- ASCIIToUTF16("save_address_line_1"),
- ASCIIToUTF16("save_address_line_2"),
- ASCIIToUTF16("save_locality_name"),
- ASCIIToUTF16("save_admin_area_name"),
- ASCIIToUTF16("save_postal_code_number"),
- ASCIIToUTF16("save_phone_number"),
- std::string()));
+ return make_scoped_ptr(new Address("US",
+ ASCIIToUTF16("save_recipient_name"),
+ ASCIIToUTF16("save_address_line_1"),
+ ASCIIToUTF16("save_address_line_2"),
+ ASCIIToUTF16("save_locality_name"),
+ ASCIIToUTF16("save_admin_area_name"),
+ ASCIIToUTF16("save_postal_code_number"),
+ ASCIIToUTF16("save_phone_number"),
+ std::string()));
}
scoped_ptr<Address> GetTestShippingAddress() {
- return scoped_ptr<Address>(new Address(
- "US",
- ASCIIToUTF16("ship_recipient_name"),
- ASCIIToUTF16("ship_address_line_1"),
- ASCIIToUTF16("ship_address_line_2"),
- ASCIIToUTF16("ship_locality_name"),
- ASCIIToUTF16("ship_admin_area_name"),
- ASCIIToUTF16("ship_postal_code_number"),
- ASCIIToUTF16("ship_phone_number"),
- "default_address_id"));
+ return make_scoped_ptr(new Address("US",
+ ASCIIToUTF16("ship_recipient_name"),
+ ASCIIToUTF16("ship_address_line_1"),
+ ASCIIToUTF16("ship_address_line_2"),
+ ASCIIToUTF16("ship_locality_name"),
+ ASCIIToUTF16("ship_admin_area_name"),
+ ASCIIToUTF16("ship_postal_code_number"),
+ ASCIIToUTF16("ship_phone_number"),
+ "default_address_id"));
}
scoped_ptr<Address> GetTestNonDefaultShippingAddress() {
@@ -242,12 +236,11 @@ scoped_ptr<WalletItems> GetTestWalletItems(
const std::string& default_instrument_id,
const std::string& default_address_id,
AmexPermission amex_permission) {
- return scoped_ptr<WalletItems>(
- new wallet::WalletItems(required_actions,
- "google_transaction_id",
- default_instrument_id,
- default_address_id,
- amex_permission));
+ return make_scoped_ptr(new wallet::WalletItems(required_actions,
+ "google_transaction_id",
+ default_instrument_id,
+ default_address_id,
+ amex_permission));
}
scoped_ptr<WalletItems> GetTestWalletItemsWithRequiredAction(
« components/autofill/content/browser/wallet/wallet_client.cc ('K') | « components/autofill/content/browser/wallet/wallet_client_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698