Add 2-lines summary to CC/Address for Wallet items.

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 <string>
 
 #include "base/bind.h"
@@ skipping 1225 matching lines @@
   suggested_shipping_.Reset();
 
   if (IsPayingWithWallet()) {
     if (wallet_items_.get()) {
       // TODO(estade): seems we need to hardcode the email address.
 
       const std::vector<wallet::Address*>& addresses =
           wallet_items_->addresses();
       for (size_t i = 0; i < addresses.size(); ++i) {
         // TODO(dbeam): respect wallet_items_->default_instrument_id().
-        suggested_shipping_.AddKeyedItem(base::IntToString(i),
-                                         addresses[i]->DisplayName());
+        suggested_shipping_.AddKeyedItemWithSublabel(
+            base::IntToString(i),
+            addresses[i]->DisplayName(),
+            addresses[i]->DisplayNameLine2());
       }
 
       const std::vector<wallet::WalletItems::MaskedInstrument*>& instruments =
           wallet_items_->instruments();
       for (size_t i = 0; i < instruments.size(); ++i) {
         // TODO(dbeam): respect wallet_items_->default_address_id().
-        suggested_cc_billing_.AddKeyedItemWithIcon(
+        suggested_cc_billing_.AddKeyedItemWithSublabelAndIcon(
             base::IntToString(i),
-            instruments[i]->descriptive_name(),
+            instruments[i]->DisplayName(),
+            instruments[i]->DisplayNameLine2(),
             instruments[i]->CardIcon());
       }
     }
 
     suggested_cc_billing_.AddKeyedItem(
         std::string(),
         l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_ADD_BILLING_DETAILS));
   } else {
     PersonalDataManager* manager = GetManager();
     const std::vector<CreditCard*>& cards = manager->credit_cards();
@@ skipping 364 matching lines @@
   callback_.Run(&form_structure_);
   callback_ = base::Callback<void(const FormStructure*)>();
 
   if (dialog_type_ == DIALOG_TYPE_REQUEST_AUTOCOMPLETE) {
     // This may delete us.
     Hide();
   }
 }
 
 }  // namespace autofill