| Index: components/autofill/content/browser/wallet/instrument.cc
|
| diff --git a/components/autofill/content/browser/wallet/instrument.cc b/components/autofill/content/browser/wallet/instrument.cc
|
| deleted file mode 100644
|
| index c7fa3b56725e2b30ef7279a9589bae00dab46bdf..0000000000000000000000000000000000000000
|
| --- a/components/autofill/content/browser/wallet/instrument.cc
|
| +++ /dev/null
|
| @@ -1,126 +0,0 @@
|
| -// 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 "components/autofill/content/browser/wallet/instrument.h"
|
| -
|
| -#include "base/logging.h"
|
| -#include "base/strings/string_number_conversions.h"
|
| -#include "base/strings/string_util.h"
|
| -#include "base/strings/utf_string_conversions.h"
|
| -#include "base/values.h"
|
| -#include "components/autofill/content/browser/wallet/wallet_address.h"
|
| -#include "components/autofill/core/browser/autofill_country.h"
|
| -#include "components/autofill/core/browser/autofill_profile.h"
|
| -#include "components/autofill/core/browser/autofill_sync_constants.h"
|
| -#include "components/autofill/core/browser/credit_card.h"
|
| -#include "components/autofill/core/browser/validation.h"
|
| -
|
| -namespace autofill {
|
| -namespace wallet {
|
| -
|
| -namespace {
|
| -
|
| -// Converts a known Autofill card type to a Instrument::FormOfPayment.
|
| -// Used for creating new Instruments.
|
| -Instrument::FormOfPayment FormOfPaymentFromCardType(const std::string& type) {
|
| - if (type == kAmericanExpressCard)
|
| - return Instrument::AMEX;
|
| - else if (type == kDiscoverCard)
|
| - return Instrument::DISCOVER;
|
| - else if (type == kMasterCard)
|
| - return Instrument::MASTER_CARD;
|
| - else if (type == kVisaCard)
|
| - return Instrument::VISA;
|
| -
|
| - return Instrument::UNKNOWN;
|
| -}
|
| -
|
| -std::string FormOfPaymentToString(Instrument::FormOfPayment form_of_payment) {
|
| - switch (form_of_payment) {
|
| - case Instrument::UNKNOWN:
|
| - return kSyncCardTypeUnknown;
|
| - case Instrument::VISA:
|
| - return kSyncCardTypeVisa;
|
| - case Instrument::MASTER_CARD:
|
| - return kSyncCardTypeMasterCard;
|
| - case Instrument::AMEX:
|
| - return kSyncCardTypeAmex;
|
| - case Instrument::DISCOVER:
|
| - return kSyncCardTypeDiscover;
|
| - case Instrument::JCB:
|
| - return kSyncCardTypeJCB;
|
| - }
|
| - NOTREACHED();
|
| - return "NOT_POSSIBLE";
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| -Instrument::Instrument(const CreditCard& card,
|
| - const base::string16& card_verification_number,
|
| - const AutofillProfile& profile)
|
| - : primary_account_number_(card.GetRawInfo(CREDIT_CARD_NUMBER)),
|
| - card_verification_number_(card_verification_number),
|
| - expiration_month_(card.expiration_month()),
|
| - expiration_year_(card.expiration_year()),
|
| - form_of_payment_(FormOfPaymentFromCardType(card.type())),
|
| - address_(new Address(profile)) {
|
| - Init();
|
| -}
|
| -
|
| -Instrument::Instrument(const base::string16& primary_account_number,
|
| - const base::string16& card_verification_number,
|
| - int expiration_month,
|
| - int expiration_year,
|
| - FormOfPayment form_of_payment,
|
| - scoped_ptr<Address> address)
|
| - : primary_account_number_(primary_account_number),
|
| - card_verification_number_(card_verification_number),
|
| - expiration_month_(expiration_month),
|
| - expiration_year_(expiration_year),
|
| - form_of_payment_(form_of_payment),
|
| - address_(address.Pass()) {
|
| - Init();
|
| -}
|
| -
|
| -Instrument::Instrument(const Instrument& instrument)
|
| - : primary_account_number_(instrument.primary_account_number()),
|
| - card_verification_number_(instrument.card_verification_number()),
|
| - expiration_month_(instrument.expiration_month()),
|
| - expiration_year_(instrument.expiration_year()),
|
| - form_of_payment_(instrument.form_of_payment()),
|
| - address_(instrument.address() ?
|
| - new Address(*instrument.address()) : NULL) {
|
| - Init();
|
| -}
|
| -
|
| -Instrument::~Instrument() {}
|
| -
|
| -scoped_ptr<base::DictionaryValue> Instrument::ToDictionary() const {
|
| - // |primary_account_number_| and |card_verification_number_| can never be
|
| - // sent the server in way that would require putting them into a dictionary.
|
| - // Never add them to this function.
|
| -
|
| - scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
|
| - dict->SetString("type", "CREDIT_CARD");
|
| - dict->SetInteger("credit_card.exp_month", expiration_month_);
|
| - dict->SetInteger("credit_card.exp_year", expiration_year_);
|
| - dict->SetString("credit_card.fop_type",
|
| - FormOfPaymentToString(form_of_payment_));
|
| - dict->SetString("credit_card.last_4_digits", last_four_digits_);
|
| - dict->Set("credit_card.address",
|
| - address_.get()->ToDictionaryWithoutID().release());
|
| -
|
| - return dict.Pass();
|
| -}
|
| -
|
| -void Instrument::Init() {
|
| - if (primary_account_number_.size() >= 4) {
|
| - last_four_digits_ =
|
| - primary_account_number_.substr(primary_account_number_.size() - 4);
|
| - }
|
| -}
|
| -
|
| -} // namespace wallet
|
| -} // namespace autofill
|
|
|