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

components/autofill/core/browser/autofill_address_util.h

Index: components/autofill/core/browser/autofill_address_util.h
diff --git a/components/autofill/core/browser/autofill_address_util.h b/components/autofill/core/browser/autofill_address_util.h
index e90ff5bfabe1d398a63fba2894dc67389398a5f9..83f3960e99e8c347c7da46c8293bcdf380a71007 100644
--- a/components/autofill/core/browser/autofill_address_util.h
+++ b/components/autofill/core/browser/autofill_address_util.h
@@ -7,6 +7,8 @@
 
 #include <string>
 
+#include "components/autofill/core/browser/field_types.h"
+
 namespace base {
 class ListValue;
 class DictionaryValue;
@@ -58,6 +60,11 @@ extern const char kShortField[];
 // AddressUiComponent::HINT_LONG.
 extern const char kLongField[];
 
+// Converts a field type in string format as returned by
+// autofill::GetAddressComponents into the appropriate autofill::ServerFieldType
+// enum.
+ServerFieldType GetFieldTypeFromString(const std::string& 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