[Payments] Remove extra line in shipping labels

chrome/browser/ui/views/payments/payment_request_views_util.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_request_views_util.h"
 
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 287 matching lines @@
 }
 
 std::unique_ptr<views::View> GetShippingAddressLabelWithMissingInfo(
     AddressStyleType type,
     const std::string& locale,
     const autofill::AutofillProfile& profile,
     const PaymentsProfileComparator& comp) {
   std::unique_ptr<views::View> base_label =
       GetShippingAddressLabel(type, locale, profile, /*disabled_state=*/false);
 
-  base_label->AddChildView(GetLabelForMissingInformation(
-                               comp.GetStringForMissingShippingFields(profile))
-                               .release());
+  base::string16 missing = comp.GetStringForMissingShippingFields(profile);
+  if (!missing.empty()) {
+    base_label->AddChildView(GetLabelForMissingInformation(missing).release());
+  }
   return base_label;
 }
 
 // TODO(anthonyvd): unit test the label layout.
 std::unique_ptr<views::View> GetContactInfoLabel(
     AddressStyleType type,
     const std::string& locale,
     const autofill::AutofillProfile& profile,
     const PaymentOptionsProvider& options,
     const PaymentsProfileComparator& comp) {
@@ skipping 11 matching lines @@
 
   base::string16 email =
       options.request_payer_email()
           ? profile.GetInfo(autofill::AutofillType(autofill::EMAIL_ADDRESS),
                             locale)
           : base::string16();
 
   std::unique_ptr<views::View> base_label =
       GetBaseProfileLabel(type, name, phone, email);
 
-  base_label->AddChildView(GetLabelForMissingInformation(
-                               comp.GetStringForMissingContactFields(profile))
-                               .release());
+  base::string16 missing = comp.GetStringForMissingContactFields(profile);
+  if (!missing.empty()) {
+    base_label->AddChildView(GetLabelForMissingInformation(missing).release());
+  }
   return base_label;
 }
 
 std::unique_ptr<views::Border> CreatePaymentRequestRowBorder(
     SkColor color,
     const gfx::Insets& insets) {
   return views::CreateBorderPainter(
       base::MakeUnique<PaymentRequestRowBorderPainter>(color), insets);
 }
 
@@ skipping 36 matching lines @@
     amount_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     amount_label->set_id(
         static_cast<int>(DialogViewID::SHIPPING_OPTION_AMOUNT));
     container->AddChildView(amount_label.release());
   }
 
   return container;
 }
 
 }  // namespace payments