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

ui/views/layout/grid_layout_unittest.cc

 // Copyright (c) 2012 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 "ui/views/layout/grid_layout.h"
 
 #include "base/compiler_specific.h"
 #include "base/test/gtest_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/views/border.h"
 #include "ui/views/test/platform_test_helper.h"
 #include "ui/views/view.h"
 
 namespace views {
 
 void ExpectViewBoundsEquals(int x, int y, int w, int h,
                             const View* view) {
   EXPECT_EQ(x, view->x());
   EXPECT_EQ(y, view->y());
   EXPECT_EQ(w, view->width());
@@ skipping 471 matching lines @@
   EXPECT_EQ(gfx::Size(50, 30), pref);
 
   host.SetBounds(0, 0, 50, 100);
   layout.Layout(&host);
   ExpectViewBoundsEquals(0, 0, 50, 90, &v1);
   ExpectViewBoundsEquals(0, 90, 50, 10, &v2);
 
   RemoveAll();
 }
 
-TEST_F(GridLayoutTest, Insets) {
+TEST_F(GridLayoutTest, Border) {
+  host.SetBorder(CreateEmptyBorder(1, 2, 3, 4));
   SettableSizeView v1(gfx::Size(10, 20));
   ColumnSet* c1 = layout.AddColumnSet(0);
-  layout.SetInsets(1, 2, 3, 4);
   c1->AddColumn(GridLayout::LEADING, GridLayout::LEADING,
                 0, GridLayout::USE_PREF, 0, 0);
   layout.StartRow(0, 0);
   layout.AddView(&v1);
 
   GetPreferredSize();
   EXPECT_EQ(gfx::Size(16, 24), pref);
 
   host.SetBounds(0, 0, pref.width(), pref.height());
   layout.Layout(&host);
   ExpectViewBoundsEquals(2, 1, 10, 20, &v1);
 
   RemoveAll();
 }
 
 TEST_F(GridLayoutTest, FixedSize) {
-  layout.SetInsets(2, 2, 2, 2);
+  host.SetBorder(CreateEmptyBorder(2, 2, 2, 2));
 
   ColumnSet* set = layout.AddColumnSet(0);
 
   int column_count = 4;
   int title_width = 100;
   int row_count = 2;
   int pref_width = 10;
   int pref_height = 20;
 
   for (int i = 0; i < column_count; ++i) {
@@ skipping 263 matching lines @@
 
   // If the View has nothing to change, adding should succeed.
   view.set_target_size(view.GetPreferredSize());
   grid_layout->AddView(&view);
   EXPECT_TRUE(view.parent());
 
   RemoveAll();
 }
 
 }  // namespace views