[Autofill] Fill from the last digits when filling a phone number with a maximum length.

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 513 matching lines @@
                                   FormFieldData* field_data) {
   AutofillType type = field.Type();
 
   // Don't fill if autocomplete=off is set on |field| on desktop for non credit
   // card related fields.
   if (!field.should_autocomplete && IsDesktopPlatform() &&
       (type.group() != CREDIT_CARD)) {
     return false;
   }
 
-  if (type.GetStorableType() == PHONE_HOME_NUMBER) {
+  if (type.group() == PHONE_HOME) {
     FillPhoneNumberField(field, value, field_data);
     return true;
   } else if (field_data->form_control_type == "select-one") {
     return FillSelectControl(type, value, app_locale, field_data);
   } else if (field_data->form_control_type == "month") {
     return FillMonthControl(value, field_data);
   } else if (type.GetStorableType() == ADDRESS_HOME_STREET_ADDRESS) {
     FillStreetAddress(value, address_language_code, field_data);
     return true;
   } else if (type.GetStorableType() == CREDIT_CARD_NUMBER) {
     FillCreditCardNumberField(field, value, field_data);
     return true;
   }
 
   field_data->value = value;
   return true;
 }
 
+// TODO(crbug.com/581514): Add support for filling only the prefix/suffix for
+// phone numbers with 10 or 11 digits.
 base::string16 AutofillField::GetPhoneNumberValue(
     const AutofillField& field,
     const base::string16& number,
     const FormFieldData& field_data) {
-  // Check to see if the size field matches the "prefix" or "suffix" size.
-  // If so, return the appropriate substring.
-  if (number.length() !=
-          PhoneNumber::kPrefixLength + PhoneNumber::kSuffixLength) {
-    return number;
+  // TODO(crbug.com/581485): Investigate the use of libphonenumber here.
+  // Check to see if the size field matches the "prefix" or "suffix" size or if

[Mathieu, 2016/01/27 14:30:49]

size field -> |field| size

[sebsg, 2016/01/27 21:01:21]

Done.

+  // the field was labeled as such. If so, return the appropriate substring.
+  if (number.length() ==
+      PhoneNumber::kPrefixLength + PhoneNumber::kSuffixLength) {
+    if (field.phone_part() == AutofillField::PHONE_PREFIX ||
+        field_data.max_length == PhoneNumber::kPrefixLength) {
+      return number.substr(PhoneNumber::kPrefixOffset,
+                           PhoneNumber::kPrefixLength);
+    }
+
+    if (field.phone_part() == AutofillField::PHONE_SUFFIX ||
+        field_data.max_length == PhoneNumber::kSuffixLength) {
+      return number.substr(PhoneNumber::kSuffixOffset,
+                           PhoneNumber::kSuffixLength);
+    }
   }
 
-  if (field.phone_part() == AutofillField::PHONE_PREFIX ||
-      field_data.max_length == PhoneNumber::kPrefixLength) {
-    return
-        number.substr(PhoneNumber::kPrefixOffset, PhoneNumber::kPrefixLength);
-  }
+  // If no max length was specified, return the complete number.
+  if (field_data.max_length == 0)
+    return number;
 
-  if (field.phone_part() == AutofillField::PHONE_SUFFIX ||
-      field_data.max_length == PhoneNumber::kSuffixLength) {
-    return
-        number.substr(PhoneNumber::kSuffixOffset, PhoneNumber::kSuffixLength);
+  // If |number| exceeds the maximum size of the field, cut the first part to
+  // provide a valid number for the field. For example, the number 15142365264
+  // with a field with a max length of 10 would return 5142365264, thus removing
+  // the country code and remaining valid.
+  if (number.length() > field_data.max_length) {
+    return number.substr(number.length() - field_data.max_length,
+                         field_data.max_length);
   }
 
   return number;
 }
 
 // static
 bool AutofillField::FindValueInSelectControl(const FormFieldData& field,
                                              const base::string16& value,
                                              size_t* index) {
   l10n::CaseInsensitiveCompare compare;
@@ skipping 12 matching lines @@
     if (compare.StringsEqual(value_stripped, option_contents)) {
       if (index)
         *index = i;
       return true;
     }
   }
   return false;
 }
 
 }  // namespace autofill