Autofill - change presentation of credit card suggestions.

Autofill - change presentation of credit card suggestions.

Instead of *********1234, Visa - 1234.

This also affects chrome://settings/autofill

BUG=none

Committed: https://crrev.com/1edeff8c6a93bd7a0158f8a0e8ef83db411e3363
Cr-Commit-Position: refs/heads/master@{#308515}

[Evan Stade, 2014-12-10 01:09:36]

estade@chromium.org changed reviewers:
+ brettw@chromium.org

[Evan Stade, 2014-12-12 19:32:01]

ping

[brettw, 2014-12-12 20:26:58]

lgtm

[Evan Stade, 2014-12-12 21:54:53]

The CQ bit was checked by estade@chromium.org

[commit-bot: I haz the power, 2014-12-12 21:56:35]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/770333006/20001

[commit-bot: I haz the power, 2014-12-12 22:07:47]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-12-12 22:07:49]

Try jobs failed on following builders:
  android_chromium_gn_compile_rel on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/android_chromiu...)
  ios_dbg_simulator on tryserver.chromium.mac
(http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_dbg_simulator...)

[Evan Stade, 2014-12-12 23:12:40]

estade@chromium.org changed reviewers:
+ aurimas@chromium.org

[Evan Stade, 2014-12-12 23:12:40]

+aurimas for android changes

[aurimas (slooooooooow), 2014-12-12 23:18:03]

lgtm

[Evan Stade, 2014-12-12 23:26:30]

The CQ bit was checked by estade@chromium.org

[commit-bot: I haz the power, 2014-12-12 23:27:14]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/770333006/60001

[commit-bot: I haz the power, 2014-12-12 23:39:22]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-12-12 23:39:24]

Try jobs failed on following builders:
  ios_dbg_simulator on tryserver.chromium.mac
(http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_dbg_simulator...)
  ios_rel_device_ninja on tryserver.chromium.mac
(http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_rel_device_ni...)

[Evan Stade, 2014-12-13 01:48:52]

The CQ bit was checked by estade@chromium.org

[commit-bot: I haz the power, 2014-12-13 01:50:49]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/770333006/100001

[commit-bot: I haz the power, 2014-12-13 03:04:30]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-12-13 03:04:31]

Try jobs failed on following builders:
  android_dbg_tests_recipe on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/android_dbg_tes...)

[Evan Stade, 2014-12-15 21:53:23]

The CQ bit was checked by estade@chromium.org

[Evan Stade, 2014-12-15 21:54:06]

The CQ bit was unchecked by estade@chromium.org

[commit-bot: I haz the power, 2014-12-15 21:54:08]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/770333006/100001

[Evan Stade, 2014-12-15 23:02:27]

The CQ bit was checked by estade@chromium.org

[commit-bot: I haz the power, 2014-12-15 23:03:34]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/770333006/120001

[commit-bot: I haz the power, 2014-12-15 23:41:22]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-12-15 23:41:24]

Failed to apply patch for
components/autofill/core/browser/autofill_manager_unittest.cc:
While running git apply --index -3 -p1;
  error: patch failed:
components/autofill/core/browser/autofill_manager_unittest.cc:870
  Falling back to three-way merge...
  Applied patch to
'components/autofill/core/browser/autofill_manager_unittest.cc' with conflicts.
  U components/autofill/core/browser/autofill_manager_unittest.cc

Patch:       components/autofill/core/browser/autofill_manager_unittest.cc
Index: components/autofill/core/browser/autofill_manager_unittest.cc
diff --git a/components/autofill/core/browser/autofill_manager_unittest.cc
b/components/autofill/core/browser/autofill_manager_unittest.cc
index
88e003ff7e5802233ee5777528d45f3618ec674d..f4da54135eb6d7f9672738abeb94d063494c0b2b
100644
--- a/components/autofill/core/browser/autofill_manager_unittest.cc
+++ b/components/autofill/core/browser/autofill_manager_unittest.cc
@@ -870,8 +870,8 @@ TEST_F(AutofillManagerTest,
GetCreditCardSuggestionsEmptyValue) {
 
   // Test that we sent the right values to the external delegate.
   base::string16 expected_values[] = {
-    ASCIIToUTF16("************3456"),
-    ASCIIToUTF16("************8765")
+    ASCIIToUTF16("Visa - 3456"),
+    ASCIIToUTF16("MasterCard - 8765")
   };
   base::string16 expected_labels[] = { ASCIIToUTF16("04/12"),
                                        ASCIIToUTF16("10/14")};
@@ -906,7 +906,7 @@ TEST_F(AutofillManagerTest,
GetCreditCardSuggestionsMatchCharacter) {
   AutocompleteSuggestionsReturned(std::vector<base::string16>());
 
   // Test that we sent the right values to the external delegate.
-  base::string16 expected_values[] = {ASCIIToUTF16("************3456")};
+  base::string16 expected_values[] = {ASCIIToUTF16("Visa - 3456")};
   base::string16 expected_labels[] = {ASCIIToUTF16("04/12")};
   base::string16 expected_icons[] = {ASCIIToUTF16(kVisaCard)};
   int expected_unique_ids[] = {autofill_manager_->GetPackedCreditCardID(4)};
@@ -1035,9 +1035,9 @@ TEST_F(AutofillManagerTest,
GetCreditCardSuggestionsRepeatedObfuscatedNumber) {
 
   // Test that we sent the right values to the external delegate.
   base::string16 expected_values[] = {
-    ASCIIToUTF16("************3456"),
-    ASCIIToUTF16("************8765"),
-    ASCIIToUTF16("************3456")
+    ASCIIToUTF16("Visa - 3456"),
+    ASCIIToUTF16("MasterCard - 8765"),
+    ASCIIToUTF16("MasterCard - 3456")
   };
   base::string16 expected_labels[] = {
     ASCIIToUTF16("04/12"),
@@ -1100,8 +1100,8 @@ TEST_F(AutofillManagerTest,
GetAddressAndCreditCardSuggestions) {
 
   // Test that we sent the credit card suggestions to the external delegate.
   base::string16 expected_values2[] = {
-    ASCIIToUTF16("************3456"),
-    ASCIIToUTF16("************8765")
+    ASCIIToUTF16("Visa - 3456"),
+    ASCIIToUTF16("MasterCard - 8765")
   };
   base::string16 expected_labels2[] = { ASCIIToUTF16("04/12"),
                                         ASCIIToUTF16("10/14")};
@@ -3102,7 +3102,7 @@ TEST_F(AutofillManagerTest,
GetCreditCardSuggestionsForNumberSpitAcrossFields) {
   // results. This triggers the combined message send.
   AutocompleteSuggestionsReturned(std::vector<base::string16>());
 
-  base::string16 expected_values[] = {ASCIIToUTF16("************3456")};
+  base::string16 expected_values[] = {ASCIIToUTF16("Visa - 3456")};
   base::string16 expected_labels[] = {ASCIIToUTF16("04/12")};
   base::string16 expected_icons[] = {ASCIIToUTF16(kVisaCard)};
   int expected_unique_ids[] = {autofill_manager_->GetPackedCreditCardID(4)};

[Evan Stade, 2014-12-16 01:57:51]

The CQ bit was checked by estade@chromium.org

[commit-bot: I haz the power, 2014-12-16 01:58:30]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/770333006/140001

[commit-bot: I haz the power, 2014-12-16 02:59:52]

Committed patchset #8 (id:140001)

[commit-bot: I haz the power, 2014-12-16 03:00:44]

Patchset 8 (id:??) landed as
https://crrev.com/1edeff8c6a93bd7a0158f8a0e8ef83db411e3363
Cr-Commit-Position: refs/heads/master@{#308515}