[Autofill] Autofill fails to show suggestions for credit card split across fields.

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 <algorithm>
 #include <functional>
 #include <iterator>
 
@@ skipping 634 matching lines @@
   // No icons for profile suggestions.
   icons->resize(values->size());
 }
 
 void PersonalDataManager::GetCreditCardSuggestions(
     const AutofillType& type,
     const base::string16& field_contents,
     std::vector<base::string16>* values,
     std::vector<base::string16>* labels,
     std::vector<base::string16>* icons,
-    std::vector<GUIDPair>* guid_pairs) {
+    std::vector<GUIDPair>* guid_pairs,
+    bool obfuscate_number) {
   values->clear();
   labels->clear();
   icons->clear();
   guid_pairs->clear();
 
   const std::vector<CreditCard*>& credit_cards = GetCreditCards();
   for (std::vector<CreditCard*>::const_iterator iter = credit_cards.begin();
        iter != credit_cards.end(); ++iter) {
     CreditCard* credit_card = *iter;
 
     // The value of the stored data for this field type in the |credit_card|.
     base::string16 creditcard_field_value =
         credit_card->GetInfo(type, app_locale_);
-    if (!creditcard_field_value.empty() &&
-        StartsWith(creditcard_field_value, field_contents, false)) {
-      if (type.GetStorableType() == CREDIT_CARD_NUMBER)
-        creditcard_field_value = credit_card->ObfuscatedNumber();
 
+    bool match_found = !creditcard_field_value.empty();
+    if (match_found && (type.GetStorableType() == CREDIT_CARD_NUMBER)) {
+      match_found =
+          (base::string16::npos != creditcard_field_value.find(field_contents));
+    } else if (match_found) {
+      match_found = StartsWith(creditcard_field_value, field_contents, false);
+    }
+
+    if (match_found) {

[Ilya Sherman, 2014/10/13 23:33:37]

nit: Please write this more like how it was previously written:

if (!creditcard_field_value.empty() &&
    (StartsWith(creditcard_field_value, field_contents, false) ||
     (type.GetStorableType() == CREDIT_CARD_NUMBER &&
      base::string16::npos != creditcard_field_value.find(field_contents))))

[Pritam Nikam, 2014/10/15 09:12:11]

Done.

       // 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.
       base::string16 label;
       if (type.GetStorableType() == CREDIT_CARD_NUMBER) {
+        if (obfuscate_number)
+          creditcard_field_value = credit_card->ObfuscatedNumber();
+
         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) {
           label =
               credit_card->GetInfo(AutofillType(CREDIT_CARD_NAME), app_locale_);
         }
       } else {
         label = kCreditCardPrefix;
         label.append(credit_card->LastFourDigits());
@@ skipping 421 matching lines @@
   // Populates |auxiliary_profiles_|.
   LoadAuxiliaryProfiles(record_metrics);
 
   profiles_.insert(profiles_.end(), web_profiles_.begin(), web_profiles_.end());
   profiles_.insert(
       profiles_.end(), auxiliary_profiles_.begin(), auxiliary_profiles_.end());
   return profiles_;
 }
 
 }  // namespace autofill