[Autofill] Autofill incorrectly fills credit card expiration year in 2-digit fields.

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 "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 88 matching lines @@
       scanner->Advance();
     } else {
       // First try to parse split month/year expiration fields.
       scanner->SaveCursor();
       pattern = base::UTF8ToUTF16(autofill::kExpirationMonthRe);
       if (!credit_card_field->expiration_month_ &&
           ParseFieldSpecifics(scanner, pattern, MATCH_DEFAULT | MATCH_SELECT,
                               &credit_card_field->expiration_month_)) {
         pattern = base::UTF8ToUTF16(autofill::kExpirationYearRe);
         if (ParseFieldSpecifics(scanner, pattern, MATCH_DEFAULT | MATCH_SELECT,
                                  &credit_card_field->expiration_year_)) {

[Evan Stade, 2014/08/22 17:30:18]

nit: could you fix the indent here

[Pritam Nikam, 2014/08/23 08:27:35]

Done.

Applied git cl format on entire content.

+          if (credit_card_field->expiration_year_->max_length == 2)
+            credit_card_field->is_two_digit_year_ = true;

[Evan Stade, 2014/08/22 17:30:18]

I kinda think a more general way to tackle this (more robust to future changes)
would be to create a function:

bool IsTwoDigitYear() {
  return is_two_digit_year_ || (expiration_year_ && expiration_year_->max_length
== 2);
}

And use that instead of checking is_two_digit_year_. That seems like it would be
more robust to future changes or additions to the code...

Also maybe switch the member var from

  bool is_two_digit_year_;

to

  ServerFieldType exp_year_type_;

Then the function above becomes

ServerFieldType GetExpirationYearType()

I think this makes the calling site cleaner.

[Pritam Nikam, 2014/08/23 08:27:35]

+1
Added,
ServerFieldType GetExpirationYearType() const;

ServerFieldType exp_year_type_;

           continue;
         }
       }
 
       // If that fails, try to parse a combined expiration field.
       if (!credit_card_field->expiration_date_) {
         // Look for a 2-digit year first.
         scanner->Rewind();
         pattern = base::UTF8ToUTF16(autofill::kExpirationDate2DigitYearRe);
         // We allow <select> fields, because they're used e.g. on qvc.com.
@@ skipping 101 matching lines @@
       ok = ok && AddClassification(expiration_year_,
                                    CREDIT_CARD_EXP_4_DIGIT_YEAR,
                                    map);
     }
   }
 
   return ok;
 }
 
 }  // namespace autofill