Bug Fix: Scroll View Shows Unnecessary Scrollbar

ui/views/controls/scroll_view_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/controls/scroll_view.h"
 
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 224 matching lines @@
 // Verifies the viewport is sized to fit the available space.
 TEST(ScrollViewTest, ViewportSizedToFit) {
   ScrollView scroll_view;
   View* contents = new View;
   scroll_view.SetContents(contents);
   scroll_view.SetBoundsRect(gfx::Rect(0, 0, 100, 100));
   scroll_view.Layout();
   EXPECT_EQ("0,0 100x100", contents->parent()->bounds().ToString());
 }
 
+// Verifies the viewport and content is sized to fit the available space for
+// bounded scroll view.
+TEST(ScrollViewTest, BoundedViewportSizedToFit) {
+  ScrollView scroll_view;
+  View* contents = new View;
+  scroll_view.SetContents(contents);
+  scroll_view.ClipHeightTo(100, 200);
+  scroll_view.SetBoundsRect(gfx::Rect(0, 0, 100, 100));
+  scroll_view.SetBorder(Border::CreateSolidBorder(2, 0));
+  scroll_view.Layout();
+  EXPECT_EQ("2,2 96x96", contents->parent()->bounds().ToString());
+
+  // Make sure the width of |contents| is set properly not to overflow the
+  // viewport.
+  EXPECT_EQ(96, contents->width());
+}
+
 // Verifies the scrollbars are added as necessary.
 // If on Mac, test the non-overlay scrollbars.
 TEST(ScrollViewTest, ScrollBars) {
 #if defined(OS_MACOSX)
   ui::test::ScopedPreferredScrollerStyle scroller_style_override(false);
 #endif
 
   ScrollView scroll_view;
   View* contents = new View;
   scroll_view.SetContents(contents);
@@ skipping 622 matching lines @@
   // Scroll via ScrollView API. Should be reflected on the impl side.
   offset.set_y(kDefaultHeight * 4);
   scroll_view->contents()->ScrollRectToVisible(offset);
   EXPECT_EQ(gfx::ScrollOffset(0, offset.y()), test_api.CurrentOffset());
 
   EXPECT_TRUE(compositor->GetScrollOffsetForLayer(layer_id, &impl_offset));
   EXPECT_EQ(gfx::ScrollOffset(0, offset.y()), impl_offset);
 }
 
 }  // namespace views