[Payments] Only show the required rows in the Payment Request dialog

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

Index: chrome/browser/ui/views/payments/payment_sheet_view_controller.cc
diff --git a/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc b/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc
index d3ce2d54890d77e9169ae11c24cd0321f4cd462b..13682a389ef7655a750dbdcecdd28fbea5dae9f2 100644
--- a/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc
+++ b/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc
@@ -184,14 +184,20 @@ std::unique_ptr<views::View> PaymentSheetViewController::CreateView() {
   columns->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,
                      1, views::GridLayout::USE_PREF, 0, 0);
 
+  // The shipping address and contact info rows are optional.
   layout->StartRow(0, 0);
   layout->AddView(CreatePaymentSheetSummaryRow().release());
-  layout->StartRow(1, 0);
-  layout->AddView(CreateShippingRow().release());
+  if (request()->request_shipping()) {
+    layout->StartRow(1, 0);
+    layout->AddView(CreateShippingRow().release());
+  }
   layout->StartRow(0, 0);
   layout->AddView(CreatePaymentMethodRow().release());
-  layout->StartRow(1, 0);
-  layout->AddView(CreateContactInfoRow().release());
+  if (request()->request_payer_name() || request()->request_payer_email() ||
+      request()->request_payer_phone()) {
+    layout->StartRow(1, 0);
+    layout->AddView(CreateContactInfoRow().release());
+  }
 
   return CreatePaymentView(
       CreateSheetHeaderView(