Fix DCHECK() when updating instruments with no phone number.

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"
 #include "base/strings/string16.h"
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace autofill {
 
@@ skipping 41 matching lines @@
   }
   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_.get(); }
   FormOfPayment form_of_payment() const { return form_of_payment_; }
   const base::string16& last_four_digits() const { return last_four_digits_; }
   const std::string& object_id() const { return object_id_; }
+  bool expiration_differs_from_server() const {
+    return expiration_differs_from_server_;
+  }
   void set_object_id(const std::string& object_id) { object_id_ = object_id; }
+  void set_expiration_differs_from_server(bool expiration_differs_from_server) {
+    expiration_differs_from_server_ = expiration_differs_from_server;
+  }
 
  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_;
 
   // Externalized Online Wallet id for this instrument.
   std::string object_id_;
 
+  // Whether the expiration date differs from the server version of this
+  // instrument.
+  bool expiration_differs_from_server_;
+
   DISALLOW_ASSIGN(Instrument);
 };
 
 }  // namespace wallet
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_INSTRUMENT_H_