[Autofill] Fill text state fields that have a max length of 2 with the state abbreviation.

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"
 #include "base/i18n/string_search.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/sha1.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/autofill_type.h"
@@ skipping 387 matching lines @@
   AddressData address_data;
   address_data.language_code = address_language_code;
   address_data.address_line = base::SplitString(
       base::UTF16ToUTF8(value), "\n",
       base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   std::string line;
   GetStreetAddressLinesAsSingleLine(address_data, &line);
   field->value = base::UTF8ToUTF16(line);
 }
 
+// Returns whether the |field| was filled with the state in |value| or its
+// abbreviation. First looks if |value| fits directly in the field, then looks
+// if the abbreviation of |value| fits. Does not fill if neither |value| or its
+// abbreviation are too long for the field.
+bool FillStateText(const base::string16& value, FormFieldData* field) {
+  if (field->max_length == 0 || field->max_length >= value.size()) {
+    // Fill the state value directly.
+    field->value = value;
+    return true;
+  } else {
+    // Fill with the state abbreviation.
+    base::string16 abbreviation;
+    state_names::GetNameAndAbbreviation(value, nullptr, &abbreviation);
+    if (abbreviation.size() != 0 && field->max_length >= abbreviation.size()) {

[vabr (Chromium), 2016/03/17 09:03:37]

optional nit: "!abbreviation.empty()" instead of "size() != 0"; the reason being
better readability, and also only asking for the least information needed
(avoiding potential performance cost, although negligible here).

[sebsg, 2016/03/17 14:46:08]

Done.

+      field->value = base::i18n::ToUpper(abbreviation);
+      return true;
+    }
+  }
+  return false;
+}
+
 std::string Hash32Bit(const std::string& str) {
   std::string hash_bin = base::SHA1HashString(str);
   DCHECK_EQ(base::kSHA1Length, hash_bin.length());
 
   uint32_t hash32 = ((hash_bin[0] & 0xFF) << 24) |
                     ((hash_bin[1] & 0xFF) << 16) | ((hash_bin[2] & 0xFF) << 8) |
                     (hash_bin[3] & 0xFF);
 
   return base::UintToString(hash32);
 }
@@ skipping 132 matching lines @@
   } 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;
+  } else if (type.GetStorableType() == ADDRESS_HOME_STATE) {
+    return FillStateText(value, field_data);
   }
 
   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,
@@ skipping 66 matching lines @@
   }
   return best_match;
 }
 
 bool AutofillField::IsCreditCardPrediction() const {
   return AutofillType(server_type_).group() == CREDIT_CARD ||
          AutofillType(heuristic_type_).group() == CREDIT_CARD;
 }
 
 }  // namespace autofill