[Autofill] Move IsValidState() into validation.h

components/autofill/browser/form_group.cc

 // Copyright (c) 2011 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/browser/form_group.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "components/autofill/browser/autofill_country.h"
+#include "components/autofill/browser/state_names.h"
+#include "components/autofill/browser/validation.h"
 #include "components/autofill/common/form_field_data.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace autofill {
 namespace {
 
-// TODO(jhawkins): Add more states/provinces.  See http://crbug.com/45039.
-
-class State {
- public:
-  const char* name;
-  const char* abbreviation;
-
-  static const State all_states[];
-
-  static base::string16 Abbreviation(const base::string16& name);
-  static base::string16 FullName(const base::string16& abbreviation);
-};
-
-const State State::all_states[] = {
-  { "alabama", "al" },
-  { "alaska", "ak" },
-  { "arizona", "az" },
-  { "arkansas", "ar" },
-  { "california", "ca" },
-  { "colorado", "co" },
-  { "connecticut", "ct" },
-  { "delaware", "de" },
-  { "district of columbia", "dc" },
-  { "florida", "fl" },
-  { "georgia", "ga" },
-  { "hawaii", "hi" },
-  { "idaho", "id" },
-  { "illinois", "il" },
-  { "indiana", "in" },
-  { "iowa", "ia" },
-  { "kansas", "ks" },
-  { "kentucky", "ky" },
-  { "louisiana", "la" },
-  { "maine", "me" },
-  { "maryland", "md" },
-  { "massachusetts", "ma" },
-  { "michigan", "mi" },
-  { "minnesota", "mv" },
-  { "mississippi", "ms" },
-  { "missouri", "mo" },
-  { "montana", "mt" },
-  { "nebraska", "ne" },
-  { "nevada", "nv" },
-  { "new hampshire", "nh" },
-  { "new jersey", "nj" },
-  { "new mexico", "nm" },
-  { "new york", "ny" },
-  { "north carolina", "nc" },
-  { "north dakota", "nd" },
-  { "ohio", "oh" },
-  { "oklahoma", "ok" },
-  { "oregon", "or" },
-  { "pennsylvania", "pa" },
-  { "puerto rico", "pr" },
-  { "rhode island", "ri" },
-  { "south carolina", "sc" },
-  { "south dakota", "sd" },
-  { "tennessee", "tn" },
-  { "texas", "tx" },
-  { "utah", "ut" },
-  { "vermont", "vt" },
-  { "virginia", "va" },
-  { "washington", "wa" },
-  { "west virginia", "wv" },
-  { "wisconsin", "wi" },
-  { "wyoming", "wy" },
-  { NULL, NULL }
-};
-
-base::string16 State::Abbreviation(const base::string16& name) {
-  for (const State* state = all_states; state->name; ++state) {
-    if (LowerCaseEqualsASCII(name, state->name))
-      return ASCIIToUTF16(state->abbreviation);
-  }
-  return base::string16();
-}
-
-base::string16 State::FullName(const base::string16& abbreviation) {
-  for (const State* state = all_states; state->name; ++state) {
-    if (LowerCaseEqualsASCII(abbreviation, state->abbreviation))
-      return ASCIIToUTF16(state->name);
-  }
-  return base::string16();
-}
-
 const char* const kMonthsAbbreviated[] = {
   NULL,  // Padding so index 1 = month 1 = January.
   "Jan", "Feb", "Mar", "Apr", "May", "Jun",
   "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
 };
 
 const char* const kMonthsFull[] = {
   NULL,  // Padding so index 1 = month 1 = January.
   "January", "February", "March", "April", "May", "June",
   "July", "August", "September", "October", "November", "December",
@@ skipping 17 matching lines @@
       field->value = field->option_values[i];
       return true;
     }
   }
 
   return false;
 }
 
 bool FillStateSelectControl(const base::string16& value,
                             FormFieldData* field) {
-  base::string16 abbrev, full;

[Evan Stade, 2013/04/15 18:55:34]

is there a rule against this type of declaration?

[Ilya Sherman, 2013/04/16 01:12:25]

Not really, I just disprefer it.  Anyway, it's no longer relevant given your
other suggestion.

+  base::string16 abbreviation;
+  base::string16 full;
   if (value.size() < 4U) {

[Evan Stade, 2013/04/15 18:55:34]

instead of this magic cutoff, why not just try GetNameForAbbreviation, and if
that fails, GetAbbreviationForName?

[Ilya Sherman, 2013/04/16 01:12:25]

Done.

-    abbrev = value;
-    full = State::FullName(value);
+    abbreviation = value;
+    full = state_names::GetNameForAbbreviation(value);
   } else {
-    abbrev = State::Abbreviation(value);
+    abbreviation = state_names::GetAbbreviationForName(value);
     full = value;
   }
 
   // Try the abbreviation name first.
-  if (!abbrev.empty() && SetSelectControlValue(abbrev, field))
+  if (!abbreviation.empty() && SetSelectControlValue(abbreviation, field))
     return true;
 
-  if (full.empty())
-    return false;
-
-  return SetSelectControlValue(full, field);
+  return !full.empty() && SetSelectControlValue(full, field);
 }
 
 bool FillExpirationMonthSelectControl(const base::string16& value,
                                       FormFieldData* field) {
   int index = 0;
   if (!base::StringToInt(value, &index) ||
       index <= 0 ||
       static_cast<size_t>(index) >= arraysize(kMonthsFull))
     return false;
 
@@ skipping 141 matching lines @@
   } else if (type == CREDIT_CARD_TYPE) {
     FillCreditCardTypeSelectControl(field_text, field);
   }
 }
 
 bool FormGroup::FillCountrySelectControl(const std::string& app_locale,
                                          FormFieldData* field_data) const {
   return false;
 }
 
-// static
-bool FormGroup::IsValidState(const base::string16& value) {
-  return !State::Abbreviation(value).empty() || !State::FullName(value).empty();
-}
-
 }  // namespace autofill