[Autofill] Fix heuristics to detect cc-number on united.com.

components/autofill/core/browser/credit_card_field.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/credit_card_field.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 118 matching lines @@
     // Note: Some sites use type="tel" or type="number" for numerical inputs.
     const int kMatchNumAndTel = MATCH_DEFAULT | MATCH_NUMBER | MATCH_TELEPHONE;
     if (!credit_card_field->verification_ &&
         ParseFieldSpecifics(scanner,
                             base::UTF8ToUTF16(kCardCvcRe),
                             kMatchNumAndTel | MATCH_PASSWORD,
                             &credit_card_field->verification_)) {
       continue;
     }
 
+    // TODO(crbug.com/591816): Make sure parsing cc-numbers of type password
+    // doesn't have bad side effects.
     AutofillField* current_number_field;
-    if (ParseFieldSpecifics(scanner,
-                            base::UTF8ToUTF16(kCardNumberRe),
-                            kMatchNumAndTel,
+    if (ParseFieldSpecifics(scanner, base::UTF8ToUTF16(kCardNumberRe),
+                            kMatchNumAndTel | MATCH_PASSWORD,
                             &current_number_field)) {
       // Avoid autofilling any credit card number field having very low or high
       // |start_index| on the HTML form.
       size_t start_index = 0;
       if (!credit_card_field->numbers_.empty()) {
         size_t last_number_field_size =
             credit_card_field->numbers_.back()->credit_card_number_offset() +
             credit_card_field->numbers_.back()->max_length;
 
         // Distinguish between
@@ skipping 302 matching lines @@
 
 ServerFieldType CreditCardField::GetExpirationYearType() const {
   return (expiration_date_
               ? exp_year_type_
               : ((expiration_year_ && expiration_year_->max_length == 2)
                      ? CREDIT_CARD_EXP_2_DIGIT_YEAR
                      : CREDIT_CARD_EXP_4_DIGIT_YEAR));
 }
 
 }  // namespace autofill