[Payment Request] Moves autofill utility function to autofill_address_util.h

chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc

 // Copyright 2017 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 "chrome/browser/ui/views/payments/shipping_address_editor_view_controller.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
@@ skipping 17 matching lines @@
 #include "components/payments/core/payments_profile_comparator.h"
 #include "components/strings/grit/components_strings.h"
 #include "third_party/libaddressinput/messages.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/textfield/textfield.h"
 
 namespace payments {
 
 namespace {
 
-// Converts a field type in string format as returned by
-// autofill::GetAddressComponents into the appropriate autofill::ServerFieldType
-// enum.
-autofill::ServerFieldType GetFieldTypeFromString(const std::string& type) {
-  if (type == autofill::kFullNameField)
-    return autofill::NAME_FULL;
-  if (type == autofill::kCompanyNameField)
-    return autofill::COMPANY_NAME;
-  if (type == autofill::kAddressLineField)
-    return autofill::ADDRESS_HOME_STREET_ADDRESS;
-  if (type == autofill::kDependentLocalityField)
-    return autofill::ADDRESS_HOME_DEPENDENT_LOCALITY;
-  if (type == autofill::kCityField)
-    return autofill::ADDRESS_HOME_CITY;
-  if (type == autofill::kStateField)
-    return autofill::ADDRESS_HOME_STATE;
-  if (type == autofill::kPostalCodeField)
-    return autofill::ADDRESS_HOME_ZIP;
-  if (type == autofill::kSortingCodeField)
-    return autofill::ADDRESS_HOME_SORTING_CODE;
-  if (type == autofill::kCountryField)
-    return autofill::ADDRESS_HOME_COUNTRY;
-  NOTREACHED();
-  return autofill::UNKNOWN_TYPE;
-}
-
 // size_t doesn't have a defined maximum value, so this is a trick to create one
 // as is done for std::string::npos.
 // http://www.cplusplus.com/reference/string/string/npos
 const size_t kInvalidCountryIndex = static_cast<size_t>(-1);
 
 }  // namespace
 
 ShippingAddressEditorViewController::ShippingAddressEditorViewController(
     PaymentRequestSpec* spec,
     PaymentRequestState* state,
@@ skipping 253 matching lines @@
       if (!component->GetString(autofill::kFieldLengthKey, &field_length)) {
         NOTREACHED();
         return;
       }
       EditorField::LengthHint length_hint = EditorField::LengthHint::HINT_SHORT;
       if (field_length == autofill::kLongField)
         length_hint = EditorField::LengthHint::HINT_LONG;
       else
         DCHECK_EQ(autofill::kShortField, field_length);
       autofill::ServerFieldType server_field_type =
-          GetFieldTypeFromString(field_type);
+          autofill::GetFieldTypeFromString(field_type);
       EditorField::ControlType control_type =
           EditorField::ControlType::TEXTFIELD;
       if (server_field_type == autofill::ADDRESS_HOME_COUNTRY ||
           (server_field_type == autofill::ADDRESS_HOME_STATE &&
            !failed_to_load_region_data_)) {
         control_type = EditorField::ControlType::COMBOBOX;
       }
       editor_fields_.emplace_back(
           server_field_type, base::UTF8ToUTF16(field_name), length_hint,
           /*required=*/server_field_type != autofill::COMPANY_NAME,
@@ skipping 158 matching lines @@
   bool is_required_valid = !field_.required;
   const base::string16 displayed_message =
       is_required_valid ? base::ASCIIToUTF16("")
                         : l10n_util::GetStringUTF16(
                               IDS_PAYMENTS_FIELD_REQUIRED_VALIDATION_MESSAGE);
   controller_->DisplayErrorMessageForField(field_, displayed_message);
   return is_required_valid;
 }
 
 }  // namespace payments