rAc - fix off-by-small-number error in grid layout

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 "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/view.h"
 
@@ skipping 328 matching lines @@
   layout.AddView(&v2);
 
   host.SetBounds(0, 0, 120, 20);
   layout.Layout(&host);
   ExpectViewBoundsEquals(0, 0, 80, 20, &v1);
   ExpectViewBoundsEquals(110, 0, 10, 10, &v2);
 
   RemoveAll();
 }
 
+// Tests that space leftover due to rounding is distributed to the last
+// resizable column.
+TEST_F(GridLayoutTest, HorizontalResizeTest3) {
+  SettableSizeView v1(gfx::Size(10, 10));
+  SettableSizeView v2(gfx::Size(10, 10));
+  SettableSizeView v3(gfx::Size(10, 10));
+  ColumnSet* c1 = layout.AddColumnSet(0);
+  c1->AddColumn(GridLayout::FILL, GridLayout::LEADING,
+                1, GridLayout::USE_PREF, 0, 0);
+  c1->AddColumn(GridLayout::FILL, GridLayout::LEADING,
+                1, GridLayout::USE_PREF, 0, 0);
+  c1->AddColumn(GridLayout::TRAILING, GridLayout::LEADING,
+                0, GridLayout::USE_PREF, 0, 0);
+  layout.StartRow(0, 0);
+  layout.AddView(&v1);
+  layout.AddView(&v2);
+  layout.AddView(&v3);
+
+  host.SetBounds(0, 0, 31, 10);
+  layout.Layout(&host);
+  ExpectViewBoundsEquals(0, 0, 10, 10, &v1);
+  ExpectViewBoundsEquals(10, 0, 11, 10, &v2);
+  ExpectViewBoundsEquals(21, 0, 10, 10, &v3);
+
+  RemoveAll();
+}
+
 TEST_F(GridLayoutTest, TestVerticalResize1) {
   SettableSizeView v1(gfx::Size(50, 20));
   SettableSizeView v2(gfx::Size(10, 10));
   ColumnSet* c1 = layout.AddColumnSet(0);
   c1->AddColumn(GridLayout::FILL, GridLayout::FILL,
                 1, GridLayout::USE_PREF, 0, 0);
   layout.StartRow(1, 0);
   layout.AddView(&v1);
   layout.StartRow(0, 0);
   layout.AddView(&v2);
@@ skipping 274 matching lines @@
   EXPECT_EQ(gfx::Size(10, 20), pref);
 
   layout.set_minimum_size(gfx::Size(40, 40));
   GetPreferredSize();
   EXPECT_EQ(gfx::Size(40, 40), pref);
 
   RemoveAll();
 }
 
 }  // namespace views