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

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

Index: components/autofill/content/browser/wallet/wallet_client.h
diff --git a/components/autofill/content/browser/wallet/wallet_client.h b/components/autofill/content/browser/wallet/wallet_client.h
index 22d0bd54ccf6df2b82f3ed05d9d8989a96653a5f..0f452ff2851caa54d1bee76ca8576584434397c6 100644
--- a/components/autofill/content/browser/wallet/wallet_client.h
+++ b/components/autofill/content/browser/wallet/wallet_client.h
@@ -165,10 +165,16 @@ class WalletClient : public net::URLFetcherDelegate {
   virtual void GetFullWallet(const FullWalletRequest& full_wallet_request);
 
   // Saves the data in |instrument| and/or |address| to Wallet. |instrument|
-  // does not have to be complete if its being used to update an existing
+  // does not have to be complete if it's being used to update an existing
   // instrument, like in the case of expiration date or address only updates.
-  virtual void SaveToWallet(scoped_ptr<Instrument> instrument,
-                            scoped_ptr<Address> address);
+  // |server_instrument| and |server_address| are the instrument and address to
+  // be updated on the server (and may be NULL if |instrument| or |address| are

[Evan Stade, 2013/12/12 02:33:57]

s/may be/should be

[Dan Beam, 2013/12/13 04:06:24]

Done.

+  // new data).
+  virtual void SaveToWallet(
+      scoped_ptr<Instrument> instrument,
+      scoped_ptr<Address> address,
+      const WalletItems::MaskedInstrument* server_instrument,

[Evan Stade, 2013/12/12 02:33:57]

nit: can you call these reference_instrument/address or original_instrument
rather than server_instrument?

[Dan Beam, 2013/12/13 04:06:24]

Done.

+      const Address* server_address);
 
   bool HasRequestInProgress() const;