[Autofill] Fix expiration month filling bug.

components/autofill/core/browser/autofill_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/autofill_field.h"
 
 #include <stdint.h>
 
 #include "base/command_line.h"
 #include "base/i18n/string_search.h"
@@ skipping 206 matching lines @@
 
   if (trimmed_values.size() == 12) {
     // The select presumable only contains the year's months.
     // If the first value of the select is 0, decrement the value of |month| so
     // January is associated with 0 instead of 1.
     int first_value;
     if (StringToInt(trimmed_values[0], &first_value) && first_value == 0)
       --month;
   } else if (trimmed_values.size() == 13) {
     // The select presumably uses the first value as a placeholder.
-    // If the first value of the select is 1, increment the value of |month| to
-    // skip the placeholder value (January = 2).
     int first_value;
-    if (StringToInt(trimmed_values[0], &first_value) && first_value == 1)
+    // If the first value is not a number. Check the second value and apply the
+    // same logic as if there was no placeholder.
+    if (!StringToInt(trimmed_values[0], &first_value)) {
+      int second_value;
+      if (StringToInt(trimmed_values[1], &second_value) && second_value == 0)
+        --month;
+    } else if (first_value == 1) {
+      // If the first value of the select is 1, increment the value of |month|
+      // to skip the placeholder value (January = 2).
       ++month;
+    }
   }
 
   // Attempt to match the user's |month| with the field's value attributes.
   for (size_t i = 0; i < trimmed_values.size(); ++i) {
     int converted_value = 0;
     // We use the trimmed value to match with |month|, but the original select
     // value to fill the field (otherwise filling wouldn't work).
     if (CreditCard::ConvertMonth(trimmed_values[i], app_locale,
                                  &converted_value) &&
         month == converted_value) {
@@ skipping 394 matching lines @@
   }
   return false;
 }
 
 bool AutofillField::IsCreditCardPrediction() const {
   return AutofillType(server_type_).group() == CREDIT_CARD ||
          AutofillType(heuristic_type_).group() == CREDIT_CARD;
 }
 
 }  // namespace autofill