New encryption/escrow endpoints for Wallet

components/autofill/content/browser/wallet/instrument.cc

 // 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"
@@ skipping 62 matching lines @@
                        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()) {
-  DCHECK(address_);
   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_(new Address(instrument.address())) {
+      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();
 }
 
-bool Instrument::IsValid() const {
-  if (!IsStringASCII(primary_account_number_))
-    return false;
-  bool primary_account_number_valid =
-      autofill::IsValidCreditCardNumber(primary_account_number_);
-  bool card_verification_number_valid = card_verification_number_.size() == 3 ||
-                                        card_verification_number_.size() == 4;
-  bool exp_month_valid = expiration_month_ >= 1 && expiration_month_ <= 12;
-  bool exp_year_valid = expiration_year_ >= 2013 && expiration_year_ <= 2100;
-
-  return primary_account_number_valid &&
-         card_verification_number_valid &&
-         exp_month_valid &&
-         exp_year_valid;
-}
-
 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