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

components/autofill/core/browser/autofill_address_util.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 "components/autofill/core/browser/autofill_address_util.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/country_combobox_model.h"
-#include "components/autofill/core/browser/field_types.h"
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_ui.h"
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_ui_component.h"
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/localization.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using autofill::AutofillCountry;
 using autofill::ServerFieldType;
 using i18n::addressinput::AddressUiComponent;
 
 namespace autofill {
@@ skipping 11 matching lines @@
 const char kCityField[] = "city";
 const char kStateField[] = "state";
 const char kPostalCodeField[] = "postalCode";
 const char kSortingCodeField[] = "sortingCode";
 const char kCountryField[] = "country";
 
 // Address field length values.
 const char kShortField[] = "short";
 const char kLongField[] = "long";
 
+ServerFieldType GetFieldTypeFromString(const std::string& type) {
+  if (type == kFullNameField)
+    return NAME_FULL;
+  if (type == kCompanyNameField)
+    return COMPANY_NAME;
+  if (type == kAddressLineField)
+    return ADDRESS_HOME_STREET_ADDRESS;
+  if (type == kDependentLocalityField)
+    return ADDRESS_HOME_DEPENDENT_LOCALITY;
+  if (type == kCityField)
+    return ADDRESS_HOME_CITY;
+  if (type == kStateField)
+    return ADDRESS_HOME_STATE;
+  if (type == kPostalCodeField)
+    return ADDRESS_HOME_ZIP;
+  if (type == kSortingCodeField)
+    return ADDRESS_HOME_SORTING_CODE;
+  if (type == kCountryField)
+    return ADDRESS_HOME_COUNTRY;
+  NOTREACHED();

[please use gerrit instead, 2017/05/19 18:46:53]

#include "base/logging.h"

[Moe, 2017/05/19 19:09:12]

Done.

+  return UNKNOWN_TYPE;
+}
+
 // Fills |components| with the address UI components that should be used to
 // input an address for |country_code| when UI BCP 47 language code is
 // |ui_language_code|. If |components_language_code| is not NULL, then sets it
 // to the BCP 47 language code that should be used to format the address for
 // display.
 void GetAddressComponents(const std::string& country_code,
                           const std::string& ui_language_code,
                           base::ListValue* address_components,
                           std::string* components_language_code) {
   DCHECK(address_components);
@@ skipping 100 matching lines @@
   GetAddressComponents(countries.front()->country_code(), ui_language_code,
                        default_country_components.get(),
                        &default_country_language_code);
   localized_strings->Set("autofillDefaultCountryComponents",
                          default_country_components.release());
   localized_strings->SetString("autofillDefaultCountryLanguageCode",
                                default_country_language_code);
 }
 
 }  // namespace autofill