Refactor app list max folder logic.

ui/app_list/views/apps_grid_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/app_list/views/apps_grid_view.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 467 matching lines @@
 
   // Dragging an item towards its neighbours should not reorder until the drag
   // is past the folder drop point.
   gfx::Point top_right = GetItemTileRectAt(0, 1).CenterPoint();
   gfx::Vector2d drag_vector;
   int half_tile_width =
       (GetItemTileRectAt(0, 1).x() - GetItemTileRectAt(0, 0).x()) / 2;
   int tile_height = GetItemTileRectAt(1, 0).y() - GetItemTileRectAt(0, 0).y();
 
   // Drag left but stop before the folder dropping circle.
-  drag_vector.set_x(-half_tile_width - 5);
+  drag_vector.set_x(-half_tile_width - 4);
   SimulateDrag(AppsGridView::MOUSE, top_right, top_right + drag_vector);
   apps_grid_view_->EndDrag(false);
   EXPECT_EQ(std::string("Item 0,Item 1,Item 2,Item 3"),
             model_->GetModelContent());
 
   // Drag left, past the folder dropping circle.
-  drag_vector.set_x(-3 * half_tile_width + 5);
+  drag_vector.set_x(-3 * half_tile_width + 4);
   SimulateDrag(AppsGridView::MOUSE, top_right, top_right + drag_vector);
   apps_grid_view_->EndDrag(false);
   EXPECT_EQ(std::string("Item 1,Item 0,Item 2,Item 3"),
             model_->GetModelContent());
 
   // Drag down, between apps 2 and 3. The gap should open up, making space for
   // app 0 in the bottom left.
   drag_vector.set_x(-half_tile_width);
   drag_vector.set_y(tile_height);
   SimulateDrag(AppsGridView::MOUSE, top_right, top_right + drag_vector);
@@ skipping 285 matching lines @@
   AppListItemView* item_view = GetItemViewAt(0);
   ASSERT_TRUE(item_view);
   const views::Label* title_label = item_view->title();
   EXPECT_FALSE(title_label->GetTooltipText(
       title_label->bounds().CenterPoint(), &actual_tooltip));
   EXPECT_EQ(title, base::UTF16ToUTF8(title_label->text()));
 }
 
 }  // namespace test
 }  // namespace app_list