Use street address collapser instead of line separator.

chrome/browser/ui/autofill/data_model_wrapper.cc

 // Copyright (c) 2012 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/data_model_wrapper.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 363 matching lines @@
 // I18nAddressDataWrapper
 
 I18nAddressDataWrapper::I18nAddressDataWrapper(
     const ::i18n::addressinput::AddressData* address)
     : address_(address) {}
 
 I18nAddressDataWrapper::~I18nAddressDataWrapper() {}
 
 base::string16 I18nAddressDataWrapper::GetInfo(const AutofillType& type) const {
   ::i18n::addressinput::AddressField field;
-  if (!i18ninput::FieldForType(type.GetStorableType(), &field))
+  if (!i18n::FieldForType(type.GetStorableType(), &field))
     return base::string16();
 
   if (field == ::i18n::addressinput::STREET_ADDRESS)
     return base::string16();
 
   if (field == ::i18n::addressinput::COUNTRY) {
     return AutofillCountry(address_->region_code,
                            g_browser_process->GetApplicationLocale()).name();
   }
 
   return base::UTF8ToUTF16(address_->GetFieldValue(field));
 }
 
 const std::string& I18nAddressDataWrapper::GetLanguageCode() const {
   return address_->language_code;
 }
 
 }  // namespace autofill