[Payment Request] Displays Contact Info in the payment summary view

ios/chrome/browser/payments/payment_request_util.mm

 // Copyright 2016 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.
 
 #import "ios/chrome/browser/payments/payment_request_util.h"
 
+#include "base/strings/string16.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/strings/grit/components_strings.h"
 #include "ios/chrome/browser/application_context.h"
 #include "ios/chrome/browser/payments/payment_request.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 namespace payment_request_util {
 
-NSString* NameLabelFromAutofillProfile(autofill::AutofillProfile* profile) {
+NSString* GetNameLabelFromAutofillProfile(autofill::AutofillProfile* profile) {
   return base::SysUTF16ToNSString(
       profile->GetInfo(autofill::AutofillType(autofill::NAME_FULL),
                        GetApplicationContext()->GetApplicationLocale()));
 }
 
-NSString* AddressLabelFromAutofillProfile(autofill::AutofillProfile* profile) {
+NSString* GetAddressLabelFromAutofillProfile(
+    autofill::AutofillProfile* profile) {
   // Name, company, and country are not included in the shipping address label.
   std::vector<autofill::ServerFieldType> label_fields;
+  label_fields.push_back(autofill::COMPANY_NAME);

[lpromero, 2017/02/27 17:52:10]

This is in conflict with the comment.

[Moe, 2017/02/27 20:49:42]

Good catch! Updated comment.

   label_fields.push_back(autofill::ADDRESS_HOME_LINE1);
   label_fields.push_back(autofill::ADDRESS_HOME_LINE2);
   label_fields.push_back(autofill::ADDRESS_HOME_DEPENDENT_LOCALITY);
   label_fields.push_back(autofill::ADDRESS_HOME_CITY);
   label_fields.push_back(autofill::ADDRESS_HOME_STATE);
   label_fields.push_back(autofill::ADDRESS_HOME_ZIP);
   label_fields.push_back(autofill::ADDRESS_HOME_SORTING_CODE);
 
-  return base::SysUTF16ToNSString(profile->ConstructInferredLabel(
+  base::string16 label = profile->ConstructInferredLabel(
       label_fields, label_fields.size(),
-      GetApplicationContext()->GetApplicationLocale()));
+      GetApplicationContext()->GetApplicationLocale());
+  return !label.empty() ? base::SysUTF16ToNSString(label) : nil;
 }
 
-NSString* PhoneNumberLabelFromAutofillProfile(
+NSString* GetPhoneNumberLabelFromAutofillProfile(
     autofill::AutofillProfile* profile) {
-  return base::SysUTF16ToNSString(profile->GetInfo(
-      autofill::AutofillType(autofill::PHONE_HOME_WHOLE_NUMBER),
-      GetApplicationContext()->GetApplicationLocale()));
+  base::string16 label = profile->GetRawInfo(autofill::PHONE_HOME_WHOLE_NUMBER);
+  return !label.empty() ? base::SysUTF16ToNSString(label) : nil;
 }
 
-web::PaymentAddress PaymentAddressFromAutofillProfile(
+NSString* GetEmailLabelFromAutofillProfile(autofill::AutofillProfile* profile) {
+  base::string16 label = profile->GetRawInfo(autofill::EMAIL_ADDRESS);
+  return !label.empty() ? base::SysUTF16ToNSString(label) : nil;
+}
+
+web::PaymentAddress GetPaymentAddressFromAutofillProfile(
     autofill::AutofillProfile* profile) {
   web::PaymentAddress address;
   address.country = profile->GetRawInfo(autofill::ADDRESS_HOME_COUNTRY);
   address.address_line.push_back(
       profile->GetRawInfo(autofill::ADDRESS_HOME_LINE1));
   address.address_line.push_back(
       profile->GetRawInfo(autofill::ADDRESS_HOME_LINE2));
   address.address_line.push_back(
       profile->GetRawInfo(autofill::ADDRESS_HOME_LINE3));
   address.region = profile->GetRawInfo(autofill::ADDRESS_HOME_STATE);
@@ skipping 103 matching lines @@
       return l10n_util::GetNSString(IDS_PAYMENTS_UNSUPPORTED_DELIVERY_OPTION);
     case web::PaymentShippingType::PICKUP:
       return l10n_util::GetNSString(IDS_PAYMENTS_UNSUPPORTED_PICKUP_OPTION);
     default:
       NOTREACHED();
       return @"";
   }
 }
 
 }  // namespace payment_request_util