Remove GridLayout::SetInsets in favor of an empty border on the host.

chrome/browser/ui/views/payments/order_summary_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/order_summary_view_controller.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
@@ skipping 29 matching lines @@
 // tests.
 std::unique_ptr<views::View> CreateLineItemView(const base::string16& label,
                                                 const base::string16& amount,
                                                 bool bold_amount,
                                                 DialogViewID amount_label_id) {
   std::unique_ptr<views::View> row = base::MakeUnique<views::View>();
 
   row->SetBorder(payments::CreatePaymentRequestRowBorder());
 
   views::GridLayout* layout = new views::GridLayout(row.get());
+  row->SetLayoutManager(layout);
 
   // The vertical spacing for these rows is slightly different than the spacing
   // spacing for clickable rows, so don't use kPaymentRequestRowVerticalInsets.
   constexpr int kRowVerticalInset = 12;
-  layout->SetInsets(kRowVerticalInset,
-                    payments::kPaymentRequestRowHorizontalInsets,
-                    kRowVerticalInset,
-                    payments::kPaymentRequestRowHorizontalInsets);
+  row->SetBorder(views::CreateEmptyBorder(
+      kRowVerticalInset, payments::kPaymentRequestRowHorizontalInsets,
+      kRowVerticalInset, payments::kPaymentRequestRowHorizontalInsets));
 
-  row->SetLayoutManager(layout);
   views::ColumnSet* columns = layout->AddColumnSet(0);
   // The first column has resize_percent = 1 so that it streches all the way
   // across the row up to the amount label. This way the first label elides as
   // required.
   columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, 1,
                      views::GridLayout::USE_PREF, 0, 0);
   columns->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER,
                      0, views::GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, 0);
@@ skipping 88 matching lines @@
                          total_label_value, true,
                          DialogViewID::ORDER_SUMMARY_TOTAL_AMOUNT_LABEL)
           .release());
 }
 
 void OrderSummaryViewController::UpdatePayButtonState(bool enabled) {
   pay_button_->SetEnabled(enabled);
 }
 
 }  // namespace payments