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

components/autofill/content/browser/wallet/wallet_client.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_WALLET_CLIENT_H_
 #define COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_WALLET_CLIENT_H_
 
 #include <queue>
 #include <string>
 #include <vector>
@@ skipping 147 matching lines @@
   // |card_verification_number|. |delegate_| is notified when the request is
   // complete. Used to respond to Risk challenges.
   virtual void AuthenticateInstrument(
       const std::string& instrument_id,
       const std::string& card_verification_number);
 
   // GetFullWallet retrieves the a FullWallet for the user.
   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;
 
   // Cancels and clears the current |request_| and |pending_requests_| (if any).
   void CancelRequests();
 
   size_t user_index() const { return user_index_; }
   void set_user_index(size_t user_index) {
     user_index_ = user_index;
   }
@@ skipping 75 matching lines @@
 
   base::WeakPtrFactory<WalletClient> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WalletClient);
 };
 
 }  // namespace wallet
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_WALLET_CLIENT_H_