Revert of Fix task manager's default sizing.

ui/views/controls/scroll_view.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/feature_list.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "ui/events/event.h"
@@ skipping 254 matching lines @@
 
 void ScrollView::SetVerticalScrollBar(ScrollBar* vert_sb) {
   DCHECK(vert_sb);
   vert_sb->SetVisible(vert_sb_->visible());
   delete vert_sb_;
   vert_sb->set_controller(this);
   vert_sb_ = vert_sb;
 }
 
 gfx::Size ScrollView::GetPreferredSize() const {
+  if (!is_bounded())
+    return View::GetPreferredSize();
+
   gfx::Size size = contents()->GetPreferredSize();
-  if (is_bounded()) {
-    size.SetToMax(gfx::Size(size.width(), min_height_));
-    size.SetToMin(gfx::Size(size.width(), max_height_));
-  }
+  size.SetToMax(gfx::Size(size.width(), min_height_));
+  size.SetToMin(gfx::Size(size.width(), max_height_));
   gfx::Insets insets = GetInsets();
   size.Enlarge(insets.width(), insets.height());
   return size;
 }
 
 int ScrollView::GetHeightForWidth(int width) const {
   if (!is_bounded())
     return View::GetHeightForWidth(width);
 
   gfx::Insets insets = GetInsets();
@@ skipping 475 matching lines @@
 
 VariableRowHeightScrollHelper::RowInfo
     FixedRowHeightScrollHelper::GetRowInfo(int y) {
   if (y < top_margin_)
     return RowInfo(0, top_margin_);
   return RowInfo((y - top_margin_) / row_height_ * row_height_ + top_margin_,
                  row_height_);
 }
 
 }  // namespace views