[Autofill] Add a separate enumeration for HTML field type hints.

components/autofill/core/browser/phone_number.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/phone_number.h"
 
 #include "base/basictypes.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 56 matching lines @@
 
 void PhoneNumber::GetSupportedTypes(ServerFieldTypeSet* supported_types) const {
   supported_types->insert(PHONE_HOME_WHOLE_NUMBER);
   supported_types->insert(PHONE_HOME_NUMBER);
   supported_types->insert(PHONE_HOME_CITY_CODE);
   supported_types->insert(PHONE_HOME_CITY_AND_NUMBER);
   supported_types->insert(PHONE_HOME_COUNTRY_CODE);
 }
 
 base::string16 PhoneNumber::GetRawInfo(ServerFieldType type) const {
-  type = AutofillType::GetEquivalentFieldType(type);
-  if (type == PHONE_HOME_WHOLE_NUMBER)
+  // TODO(isherman): Is GetStorableType even necessary?
+  if (AutofillType(type).GetStorableType() == PHONE_HOME_WHOLE_NUMBER)
     return number_;
 
   // Only the whole number is available as raw data.  All of the other types are
   // parsed from this raw info, and parsing requires knowledge of the phone
   // number's region, which is only available via GetInfo().
   return base::string16();
 }
 
 void PhoneNumber::SetRawInfo(ServerFieldType type,
                              const base::string16& value) {
-  type = AutofillType::GetEquivalentFieldType(type);
-  if (type != PHONE_HOME_CITY_AND_NUMBER &&
-      type != PHONE_HOME_WHOLE_NUMBER) {
+  // TODO(isherman): Is GetStorableType even necessary?
+  type = AutofillType(type).GetStorableType();
+  if (type != PHONE_HOME_CITY_AND_NUMBER && type != PHONE_HOME_WHOLE_NUMBER) {
     // Only full phone numbers should be set directly.  The remaining field
     // field types are read-only.
     return;
   }
 
   number_ = value;
 
   // Invalidate the cached number.
   cached_parsed_phone_ = i18n::PhoneObject();
 }
 
 // Normalize phones if |type| is a whole number:
 //   (650)2345678 -> 6502345678
 //   1-800-FLOWERS -> 18003569377
 // If the phone cannot be normalized, returns the stored value verbatim.
 base::string16 PhoneNumber::GetInfo(const AutofillType& type,
                                     const std::string& app_locale) const {
-  ServerFieldType server_type =
-      AutofillType::GetEquivalentFieldType(type.server_type());
+  ServerFieldType storable_type = type.GetStorableType();
   UpdateCacheIfNeeded(app_locale);
 
   // Queries for whole numbers will return the non-normalized number if
   // normalization for the number fails.  All other field types require
   // normalization.
-  if (server_type != PHONE_HOME_WHOLE_NUMBER &&
+  if (storable_type != PHONE_HOME_WHOLE_NUMBER &&
       !cached_parsed_phone_.IsValidNumber())
     return base::string16();
 
-  switch (server_type) {
+  switch (storable_type) {
     case PHONE_HOME_WHOLE_NUMBER:
       return cached_parsed_phone_.GetWholeNumber();
 
     case PHONE_HOME_NUMBER:
       return cached_parsed_phone_.number();
 
     case PHONE_HOME_CITY_CODE:
       return cached_parsed_phone_.city_code();
 
     case PHONE_HOME_COUNTRY_CODE:
       return cached_parsed_phone_.country_code();
 
     case PHONE_HOME_CITY_AND_NUMBER:
       return
           cached_parsed_phone_.city_code() + cached_parsed_phone_.number();
 
     default:
       NOTREACHED();
       return base::string16();
   }
 }
 
 bool PhoneNumber::SetInfo(const AutofillType& type,
                           const base::string16& value,
                           const std::string& app_locale) {
-  ServerFieldType server_type =
-      AutofillType::GetEquivalentFieldType(type.server_type());
-  SetRawInfo(server_type, value);
+  SetRawInfo(type.GetStorableType(), value);
 
   if (number_.empty())
     return true;
 
   // Store a formatted (i.e., pretty printed) version of the number.
   UpdateCacheIfNeeded(app_locale);
   number_ = cached_parsed_phone_.GetFormattedNumber();
   return !number_.empty();
 }
 
@@ skipping 30 matching lines @@
   if (!number_.empty() && cached_parsed_phone_.region() != region)
     cached_parsed_phone_ = i18n::PhoneObject(number_, region);
 }
 
 PhoneNumber::PhoneCombineHelper::PhoneCombineHelper() {
 }
 
 PhoneNumber::PhoneCombineHelper::~PhoneCombineHelper() {
 }
 
-bool PhoneNumber::PhoneCombineHelper::SetInfo(const AutofillType& field_type,
+bool PhoneNumber::PhoneCombineHelper::SetInfo(const AutofillType& type,
                                               const base::string16& value) {
-  ServerFieldType server_field_type =
-      AutofillType::GetEquivalentFieldType(field_type.server_type());
-  if (server_field_type == PHONE_HOME_COUNTRY_CODE) {
+  ServerFieldType storable_type = type.GetStorableType();
+  if (storable_type == PHONE_HOME_COUNTRY_CODE) {
     country_ = value;
     return true;
   }
 
-  if (server_field_type == PHONE_HOME_CITY_CODE) {
+  if (storable_type == PHONE_HOME_CITY_CODE) {
     city_ = value;
     return true;
   }
 
-  if (server_field_type == PHONE_HOME_CITY_AND_NUMBER) {
+  if (storable_type == PHONE_HOME_CITY_AND_NUMBER) {
     phone_ = value;
     return true;
   }
 
-  if (server_field_type == PHONE_HOME_WHOLE_NUMBER) {
+  if (storable_type == PHONE_HOME_WHOLE_NUMBER) {
     whole_number_ = value;
     return true;
   }
 
-  if (server_field_type == PHONE_HOME_NUMBER) {
+  if (storable_type == PHONE_HOME_NUMBER) {
     phone_.append(value);
     return true;
   }
 
   return false;
 }
 
 bool PhoneNumber::PhoneCombineHelper::ParseNumber(
     const AutofillProfile& profile,
     const std::string& app_locale,
     base::string16* value) {
   if (IsEmpty())
     return false;
 
   if (!whole_number_.empty()) {
     *value = whole_number_;
     return true;
   }
 
   return i18n::ConstructPhoneNumber(
       country_, city_, phone_, GetRegion(profile, app_locale), value);
 }
 
 bool PhoneNumber::PhoneCombineHelper::IsEmpty() const {
   return phone_.empty() && whole_number_.empty();
 }
 
 }  // namespace autofill