rAc: support street-address.

components/autofill/content/browser/wallet/wallet_address.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 "components/autofill/content/browser/wallet/wallet_address.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 262 matching lines @@
   // Wallet only supports the US right now, stick to national formatting.
   return i18n::PhoneObject(phone_number(), country_name_code()).
       GetNationallyFormattedNumber();
 }
 
 base::string16 Address::GetInfo(const AutofillType& type,
                                 const std::string& app_locale) const {
   if (type.html_type() == HTML_TYPE_COUNTRY_CODE) {
     DCHECK(IsStringASCII(country_name_code()));
     return base::ASCIIToUTF16(country_name_code());
-  } else if (type.html_type() == HTML_TYPE_STREET_ADDRESS) {
-    base::string16 address = address_line_1();
-    if (!address_line_2().empty())
-      address += base::ASCIIToUTF16(", ") + address_line_2();
-    return address;
   }
 
   switch (type.GetStorableType()) {
     case NAME_FULL:
       return recipient_name();
 
+    case ADDRESS_HOME_STREET_ADDRESS: {
+      base::string16 address = address_line_1();
+      if (!address_line_2().empty())
+        address += base::ASCIIToUTF16("\n") + address_line_2();
+      return address;
+    }
+
     case ADDRESS_HOME_LINE1:
       return address_line_1();
 
     case ADDRESS_HOME_LINE2:
       return address_line_2();
 
     case ADDRESS_HOME_CITY:
       return locality_name();
 
     case ADDRESS_HOME_STATE:
@@ skipping 46 matching lines @@
 bool Address::operator==(const Address& other) const {
   return object_id_ == other.object_id_ && EqualsIgnoreID(other);
 }
 
 bool Address::operator!=(const Address& other) const {
   return !(*this == other);
 }
 
 }  // namespace wallet
 }  // namespace autofill