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

chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc

 // 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.
 
 #include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 3149 matching lines @@
   if (!IsManuallyEditingSection(SECTION_SHIPPING) &&
       !ShouldUseBillingForShipping() &&
       IsShippingAddressRequired()) {
     active_address_id_ = active_address->object_id();
     DCHECK(!active_address_id_.empty());
   }
 
   scoped_ptr<wallet::Instrument> inputted_instrument =
       CreateTransientInstrument();
   if (inputted_instrument && IsEditingExistingData(SECTION_CC_BILLING)) {
     inputted_instrument->set_object_id(active_instrument->object_id());

[Evan Stade, 2013/12/07 02:36:12]

then you can remove this?

[Dan Beam, 2013/12/10 22:04:31]

Done.

     DCHECK(!inputted_instrument->object_id().empty());
+
+    int server_month = active_instrument->expiration_month();
+    int server_year = active_instrument->expiration_month();

[Evan Stade, 2013/12/07 02:36:12]

I'd rather you pass active_instrument_ to SaveToWallet as a reference.

[Dan Beam, 2013/12/10 22:04:31]

Done.

+    if (server_month != inputted_instrument->expiration_month() ||
+        server_year != inputted_instrument->expiration_year()) {
+      inputted_instrument->set_expiration_differs_from_server(true);
+    }
   }
 
   scoped_ptr<wallet::Address> inputted_address;
   if (active_address_id_.empty() && IsShippingAddressRequired()) {
     if (ShouldUseBillingForShipping()) {
       const wallet::Address& address = inputted_instrument ?
           *inputted_instrument->address() : active_instrument->address();
       // Try to find an exact matched shipping address and use it for shipping,
       // otherwise save it as a new shipping address. http://crbug.com/225442
       const wallet::Address* duplicated_address =
@@ skipping 359 matching lines @@
   view_->UpdateButtonStrip();
 }
 
 void AutofillDialogControllerImpl::FetchWalletCookie() {
   net::URLRequestContextGetter* request_context = profile_->GetRequestContext();
   signin_helper_.reset(new wallet::WalletSigninHelper(this, request_context));
   signin_helper_->StartWalletCookieValueFetch();
 }
 
 }  // namespace autofill