Add card details and legal message to Android save credit card infobar.

components/autofill/core/browser/personal_data_manager.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 "components/autofill/core/browser/personal_data_manager.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <utility>
 
@@ skipping 957 matching lines @@
     Suggestion* suggestion = &suggestions.back();
 
     suggestion->value = credit_card->GetInfo(type, app_locale_);
     suggestion->icon = base::UTF8ToUTF16(credit_card->type());
     suggestion->backend_id = credit_card->guid();
 
     // If the value is the card number, the label is the expiration date.
     // Otherwise the label is the card number, or if that is empty the
     // cardholder name. The label should never repeat the value.
     if (type.GetStorableType() == CREDIT_CARD_NUMBER) {
-      suggestion->value = credit_card->TypeAndLastFourDigits();
+      suggestion->value = credit_card->TypeAndLastFourDigitsForDisplay();
       suggestion->label = credit_card->GetInfo(
           AutofillType(CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR), app_locale_);
     } else if (credit_card->number().empty()) {
       if (type.GetStorableType() != CREDIT_CARD_NAME) {
         suggestion->label =
             credit_card->GetInfo(AutofillType(CREDIT_CARD_NAME), app_locale_);
       }
     } else {
 #if defined(OS_ANDROID)
       // Since Android places the label on its own row, there's more horizontal
-      // space to work with. Show "Amex - 1234" rather than desktop's "*1234".
-      suggestion->label = credit_card->TypeAndLastFourDigits();
+      // space to work with. Show "Amex ***1234" rather than desktop's "*1234".
+      suggestion->label = credit_card->TypeAndLastFourDigitsForDisplay();
 #else
       suggestion->label = base::ASCIIToUTF16("*");
       suggestion->label.append(credit_card->LastFourDigits());
 #endif
     }
   }
   return suggestions;
 }
 
 bool PersonalDataManager::IsAutofillEnabled() const {
@@ skipping 369 matching lines @@
                    web_profiles().end());
   if (IsExperimentalWalletIntegrationEnabled() &&
       pref_service_->GetBoolean(prefs::kAutofillWalletImportEnabled)) {
     profiles_.insert(
         profiles_.end(), server_profiles_.begin(), server_profiles_.end());
   }
   return profiles_;
 }
 
 }  // namespace autofill