Use street address collapser instead of line separator.

chrome/browser/ui/autofill/autofill_dialog_controller_impl.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 "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 1984 matching lines @@
     FillFormGroupFromOutputs(inputs, &profile);
     scoped_ptr<AddressData> address_data =
         i18n::CreateAddressDataFromAutofillProfile(
             profile, g_browser_process->GetApplicationLocale());
     address_data->language_code = AddressLanguageCodeForSection(section);
 
     Localization localization;
     localization.SetGetter(l10n_util::GetStringUTF8);
     FieldProblemMap problems;
     status = GetValidator()->ValidateAddress(*address_data, NULL, &problems);
-    common::AddressType address_type = section == SECTION_SHIPPING ?
-        common::ADDRESS_TYPE_SHIPPING : common::ADDRESS_TYPE_BILLING;
+    bool billing = section != SECTION_SHIPPING;
 
     for (FieldProblemMap::const_iterator iter = problems.begin();
          iter != problems.end(); ++iter) {
       bool sure = iter->second != MISSING_REQUIRED_FIELD;
       base::string16 text = base::UTF8ToUTF16(localization.GetErrorMessage(
           *address_data, iter->first, iter->second, true, false));
-      messages.Set(i18ninput::TypeForField(iter->first, address_type),
+      messages.Set(i18n::TypeForField(iter->first, billing),
                    ValidityMessage(text, sure));
     }
   }
 
   for (FieldValueMap::const_iterator iter = inputs.begin();
        iter != inputs.end(); ++iter) {
     const ServerFieldType type = iter->first;
     base::string16 text = InputValidityMessage(section, type, iter->second);
 
     // Skip empty/unchanged fields in edit mode. If the individual field does
@@ skipping 1369 matching lines @@
   return NULL;
 }
 
 void AutofillDialogControllerImpl::GetI18nValidatorSuggestions(
     DialogSection section,
     ServerFieldType type,
     std::vector<base::string16>* popup_values,
     std::vector<base::string16>* popup_labels,
     std::vector<base::string16>* popup_icons) {
   AddressField focused_field;
-  if (!i18ninput::FieldForType(type, &focused_field))
+  if (!i18n::FieldForType(type, &focused_field))
     return;
 
   FieldValueMap inputs;
   view_->GetUserInput(section, &inputs);
 
   AutofillProfile profile;
   FillFormGroupFromOutputs(inputs, &profile);
 
   scoped_ptr<AddressData> user_input =
       i18n::CreateAddressDataFromAutofillProfile(
@@ skipping 744 matching lines @@
   view_->UpdateButtonStrip();
 }
 
 void AutofillDialogControllerImpl::FetchWalletCookie() {
   net::URLRequestContextGetter* request_context = profile_->GetRequestContext();
   signin_helper_.reset(new wallet::WalletSigninHelper(this, request_context));
   signin_helper_->StartWalletCookieValueFetch();
 }
 
 }  // namespace autofill