Use street address collapser instead of line separator.

components/autofill/core/browser/address_i18n.h

 // Copyright 2014 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.
 
 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_ADDRESS_I18N_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_ADDRESS_I18N_H_
 
 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
+#include "components/autofill/core/browser/field_types.h"
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_field.h"
 
 namespace i18n {
 namespace addressinput {
 struct AddressData;
 }
 }
 
 namespace autofill {
 
 class AutofillProfile;
 class AutofillType;
 
 namespace i18n {
 
 // Creates an AddressData object for internationalized address display or
 // validation using |get_info| for field values.
 scoped_ptr< ::i18n::addressinput::AddressData> CreateAddressData(
     const base::Callback<base::string16(const AutofillType&)>& get_info);
 
 // Creates an |AddressData| from |profile|.
 scoped_ptr< ::i18n::addressinput::AddressData>
     CreateAddressDataFromAutofillProfile(const AutofillProfile& profile,
                                          const std::string& app_locale);
 
+// Returns the corresponding Autofill server type for |field|.
+ServerFieldType TypeForField(::i18n::addressinput::AddressField field,
+                             bool billing);
+
+// Sets |field| to the corresponding address field for the Autofill
+// |server_type|. Returns |true| if |server_type| can be represented as an
+// address field. The |field| parameter can be NULL.
+bool FieldForType(ServerFieldType server_type,
+                  ::i18n::addressinput::AddressField* field);
+
 }  // namespace i18n
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_ADDRESS_I18N_H_