Autofill: Check for common angular js prefix when filling exp month.

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/case_conversion.h"
@@ skipping 181 matching lines @@
 // |field|. Since |value| is well defined but the website's |field| option
 // values may not be, some heuristics are run to cover all observed cases.
 bool FillExpirationMonthSelectControl(const base::string16& value,
                                       const std::string& app_locale,
                                       FormFieldData* field) {
   // |value| is defined to be between 1 and 12, inclusively.
   int month = 0;
   if (!StringToInt(value, &month) || month <= 0 || month > 12)
     return false;
 
-  // We trim the whitespace from the select values before attempting to convert
-  // them to months.
+  // We trim the whitespace and a specific prefix used in AngularJS from the
+  // select values before attempting to convert them to months.
   std::vector<base::string16> trimmed_values(field->option_values.size());
-  for (size_t i = 0; i < field->option_values.size(); ++i)
+  const base::string16 kNumberPrefix = ASCIIToUTF16("number:");
+  for (size_t i = 0; i < field->option_values.size(); ++i) {
+    base::ReplaceSubstringsAfterOffset(&trimmed_values[i], 0, kNumberPrefix,

[Justin Donnelly, 2016/04/21 20:11:10]

ReplaceFirstSubstringAfterOffset?

[Mathieu, 2016/04/22 02:30:37]

Oops, thanks!

+                                       ASCIIToUTF16(""));
     base::TrimWhitespace(field->option_values[i], base::TRIM_ALL,
                          &trimmed_values[i]);
+  }
 
   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.
@@ skipping 151 matching lines @@
   }
 
   return false;
 }
 
 // Fills in the month control |field| with |value|.  |value| should be a date
 // formatted as MM/YYYY.  If it isn't, filling will fail.
 bool FillMonthControl(const base::string16& value, FormFieldData* field) {
   // Autofill formats a combined date as month/year.
   std::vector<base::string16> pieces = base::SplitString(
-      value, base::ASCIIToUTF16("/"),
-      base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+      value, ASCIIToUTF16("/"), base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   if (pieces.size() != 2)
     return false;
 
   // HTML5 input="month" is formatted as year-month.
   base::string16 month = pieces[0];
   base::string16 year = pieces[1];
   if ((month.size() != 1 && month.size() != 2) || year.size() != 4)
     return false;
 
   // HTML5 input="month" expects zero-padded months.
@@ skipping 279 matching lines @@
   }
   return best_match;
 }
 
 bool AutofillField::IsCreditCardPrediction() const {
   return AutofillType(server_type_).group() == CREDIT_CARD ||
          AutofillType(heuristic_type_).group() == CREDIT_CARD;
 }
 
 }  // namespace autofill