[Autofill] Check for full state name and abbreviation when determining types to upload.

components/autofill/core/browser/address.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/address.h"
 
 #include <stddef.h>
 #include <algorithm>
 
 #include "base/logging.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_field.h"
+#include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/country_names.h"
+#include "components/autofill/core/browser/state_names.h"
+#include "components/autofill/core/common/autofill_l10n_util.h"
 
 namespace autofill {
 
 Address::Address() {}
 
 Address::Address(const Address& address) : FormGroup() {
   *this = address;
 }
 
 Address::~Address() {}
@@ skipping 163 matching lines @@
 
 void Address::GetMatchingTypes(const base::string16& text,
                                const std::string& app_locale,
                                ServerFieldTypeSet* matching_types) const {
   FormGroup::GetMatchingTypes(text, app_locale, matching_types);
 
   // Check to see if the |text| canonicalized as a country name is a match.
   std::string country_code = CountryNames::GetInstance()->GetCountryCode(text);
   if (!country_code.empty() && country_code_ == country_code)
     matching_types->insert(ADDRESS_HOME_COUNTRY);
+
+  // Check to see if the |text| could be the full name or abbreviation of a
+  // state.
+  base::string16 canon_text = AutofillProfile::CanonicalizeProfileString(text);
+  base::string16 state_name, state_abbreviation;

[vabr (Chromium), 2016/03/18 12:03:50]

optional: One line per variable, please.
I believe this was part of the style guide at some point, but could not find it
anymore (hence this is optional). Most of the code still honours this rule,
however, so it might confuse the reader to have two variables defined on one
line.

[sebsg, 2016/03/18 13:03:55]

Thanks, I also changed the other calls to this method that used a one line
instantiation.

+  state_names::GetNameAndAbbreviation(canon_text, &state_name,
+                                      &state_abbreviation);
+  if (!state_name.empty() || !state_abbreviation.empty()) {
+    l10n::CaseInsensitiveCompare compare;
+    base::string16 canon_profile_state =
+        AutofillProfile::CanonicalizeProfileString(
+            GetInfo(AutofillType(ADDRESS_HOME_STATE), app_locale));
+    if ((!state_name.empty() &&
+         compare.StringsEqual(state_name, canon_profile_state)) ||
+        (!state_abbreviation.empty() &&
+         compare.StringsEqual(state_abbreviation, canon_profile_state))) {
+      matching_types->insert(ADDRESS_HOME_STATE);
+    }
+  }
 }
 
 void Address::GetSupportedTypes(ServerFieldTypeSet* supported_types) const {
   supported_types->insert(ADDRESS_HOME_LINE1);
   supported_types->insert(ADDRESS_HOME_LINE2);
   supported_types->insert(ADDRESS_HOME_LINE3);
   supported_types->insert(ADDRESS_HOME_STREET_ADDRESS);
   supported_types->insert(ADDRESS_HOME_DEPENDENT_LOCALITY);
   supported_types->insert(ADDRESS_HOME_CITY);
   supported_types->insert(ADDRESS_HOME_STATE);
   supported_types->insert(ADDRESS_HOME_ZIP);
   supported_types->insert(ADDRESS_HOME_SORTING_CODE);
   supported_types->insert(ADDRESS_HOME_COUNTRY);
 }
 
 void Address::TrimStreetAddress() {
   while (!street_address_.empty() && street_address_.back().empty()) {
     street_address_.pop_back();
   }
 }
 
 }  // namespace autofill