New encryption/escrow endpoints for Wallet

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

Index: components/autofill/content/browser/wallet/instrument.h
diff --git a/components/autofill/content/browser/wallet/instrument.h b/components/autofill/content/browser/wallet/instrument.h
index 910e2cbce0d65258bd0b38f61247a76e6cb388b3..f9b89bc3544e2d294a7a339b2f4c483a7796bb99 100644
--- a/components/autofill/content/browser/wallet/instrument.h
+++ b/components/autofill/content/browser/wallet/instrument.h
@@ -55,10 +55,6 @@ class 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_;
   }
@@ -67,9 +63,11 @@ class Instrument {
   }
   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();
@@ -95,6 +93,8 @@ class Instrument {
   // The last four digits of |primary_account_number_|.
   base::string16 last_four_digits_;
 
+  std::string object_id_;
+
   DISALLOW_ASSIGN(Instrument);
 };