[WebPayments] Show labels on incomplete profiles

chrome/browser/ui/views/payments/payment_sheet_view_controller.cc

 // 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.
 
 #include "chrome/browser/ui/views/payments/payment_sheet_view_controller.h"
 
 #include <algorithm>
 #include <memory>
 #include <string>
 #include <utility>
@@ skipping 580 matching lines @@
 }
 
 std::unique_ptr<views::View>
 PaymentSheetViewController::CreateShippingSectionContent() {
   if (current_update_reason_ ==
       PaymentRequestSpec::UpdateReason::SHIPPING_ADDRESS) {
     return CreateCheckingSpinnerView();
   } else {
     auto* profile = state()->selected_shipping_profile();
 
-    return profile ? GetShippingAddressLabel(AddressStyleType::SUMMARY,
-                                             state()->GetApplicationLocale(),
-                                             *profile)
-                   : base::MakeUnique<views::Label>(base::string16());
+    return profile
+               ? GetShippingAddressLabel(
+                     AddressStyleType::SUMMARY, state()->GetApplicationLocale(),
+                     *profile, *spec(), *(state()->profile_comparator()))
+               : base::MakeUnique<views::Label>(base::string16());
   }
 }
 
 // Creates the Shipping row, which contains a "Shipping address" label, the
 // user's selected shipping address, and a chevron.
 // +----------------------------------------------+
 // | Shipping Address   Barack Obama              |
 // |                    1600 Pennsylvania Ave.  > |
 // |                    1800MYPOTUS               |
 // +----------------------------------------------+
@@ skipping 105 matching lines @@
           state()->available_instruments()[0]->label(), format,
           state()->available_instruments().size() - 1, button_string,
           /*button_enabled=*/true);
     }
   }
 }
 
 std::unique_ptr<views::View>
 PaymentSheetViewController::CreateContactInfoSectionContent() {
   autofill::AutofillProfile* profile = state()->selected_contact_profile();
-  return profile ? payments::GetContactInfoLabel(
-                       AddressStyleType::SUMMARY,
-                       state()->GetApplicationLocale(), *profile, *spec())
-                 : base::MakeUnique<views::Label>(base::string16());
+  return profile
+             ? payments::GetContactInfoLabel(
+                   AddressStyleType::SUMMARY, state()->GetApplicationLocale(),
+                   *profile, *spec(), *(state()->profile_comparator()))
+             : base::MakeUnique<views::Label>(base::string16());
 }
 
 // Creates the Contact Info row, which contains a "Contact info" label; the
 // name, email address, and/or phone number; and a chevron.
 // +----------------------------------------------+
 // | Contact info       Barack Obama              |
 // |                    1800MYPOTUS             > |
 // |                    potus@whitehouse.gov      |
 // +----------------------------------------------+
 std::unique_ptr<views::Button>
@@ skipping 101 matching lines @@
   } else {
     return builder
         .Id(DialogViewID::PAYMENT_SHEET_SHIPPING_OPTION_SECTION_BUTTON)
         .CreateWithButton(
             l10n_util::GetStringUTF16(IDS_PAYMENT_REQUEST_CHOOSE_AN_ADDRESS),
             l10n_util::GetStringUTF16(IDS_CHOOSE), /*button_enabled=*/false);
   }
 }
 
 }  // namespace payments