New encryption/escrow endpoints for Wallet

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

 // 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.
 
 #ifndef COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_INSTRUMENT_H_
 #define COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_INSTRUMENT_H_
 
 #include <string>
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 37 matching lines @@
              int expiration_year,
              FormOfPayment form_of_payment,
              scoped_ptr<Address> address);
 
   Instrument(const Instrument& instrument);
 
   ~Instrument();
 
   scoped_ptr<base::DictionaryValue> ToDictionary() const;
 
-  // Users of this class should call IsValid to check that the inputs provided
-  // in the constructor were valid for use with Google Wallet.
-  bool IsValid() const;
-
   const base::string16& primary_account_number() const {
     return primary_account_number_;
   }
   const base::string16& card_verification_number() const {
     return card_verification_number_;
   }
   int expiration_month() const { return expiration_month_; }
   int expiration_year() const { return expiration_year_; }
-  const Address& address() const { return *address_; }
+  const Address* address() const { return address_.get(); }
   FormOfPayment form_of_payment() const { return form_of_payment_; }
   const base::string16& last_four_digits() { return last_four_digits_; }
+  const std::string& object_id() const { return object_id_; }
+  void set_object_id(const std::string& object_id) { object_id_ = object_id; }
 
  private:
   void Init();
 
   // |primary_account_number_| is expected to be \d{12-19}.
   base::string16 primary_account_number_;
 
   // |card_verification_number_| is expected to be \d{3-4}.
   base::string16 card_verification_number_;
 
   // |expiration month_| should be 1-12.
   int expiration_month_;
 
   // |expiration_year_| should be a 4-digit year.
   int expiration_year_;
 
   // The payment network of the instrument, e.g. Visa.
   FormOfPayment form_of_payment_;
 
   // The billing address of the instrument.
   scoped_ptr<Address> address_;
 
   // The last four digits of |primary_account_number_|.
   base::string16 last_four_digits_;
 

[Dan Beam, 2013/07/02 21:03:11]

nit: doc

[ahutter, 2013/07/02 21:15:56]

Done.

+  std::string object_id_;
+
   DISALLOW_ASSIGN(Instrument);
 };
 
 }  // namespace wallet
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_INSTRUMENT_H_