Hardcode applist icon dimension and shadows.

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 13 matching lines @@
 #include "ui/app_list/views/app_list_item_view.h"
 #include "ui/app_list/views/apps_grid_view_folder_delegate.h"
 #include "ui/app_list/views/test/apps_grid_view_test_api.h"
 #include "ui/views/test/views_test_base.h"
 
 namespace app_list {
 namespace test {
 
 namespace {
 
-const int kIconDimension = 48;
 const int kCols = 2;
 const int kRows = 2;
 const int kTilesPerPage = kCols * kRows;
 
 const int kWidth = 320;
 const int kHeight = 240;
 
 class PageFlipWaiter : public PaginationModelObserver {
  public:
   PageFlipWaiter(base::MessageLoopForUI* ui_loop, PaginationModel* model)
@@ skipping 50 matching lines @@
   AppsGridViewTest() {}
   virtual ~AppsGridViewTest() {}
 
   // testing::Test overrides:
   virtual void SetUp() OVERRIDE {
     views::ViewsTestBase::SetUp();
     model_.reset(new AppListTestModel);
     model_->SetFoldersEnabled(true);
 
     apps_grid_view_.reset(new AppsGridView(NULL));
-    apps_grid_view_->SetLayout(kIconDimension, kCols, kRows);
+    apps_grid_view_->SetLayout(kCols, kRows);
     apps_grid_view_->SetBoundsRect(gfx::Rect(gfx::Size(kWidth, kHeight)));
     apps_grid_view_->SetModel(model_.get());
     apps_grid_view_->SetItemList(model_->top_level_item_list());
 
     test_api_.reset(new AppsGridViewTestApi(apps_grid_view_.get()));
   }
   virtual void TearDown() OVERRIDE {
     apps_grid_view_.reset();  // Release apps grid view before models.
     views::ViewsTestBase::TearDown();
   }
@@ skipping 309 matching lines @@
   EnsureFoldersEnabled();
 
   size_t kTotalItems = 2;
   model_->PopulateApps(kTotalItems);
   EXPECT_EQ(2u, model_->top_level_item_list()->item_count());
   EXPECT_EQ(std::string("Item 0,Item 1"), model_->GetModelContent());
 
   gfx::Point from = GetItemTileRectAt(0, 1).CenterPoint();
   int reorder_offset = (GetItemTileRectAt(0, 1).CenterPoint() -
                         GetItemTileRectAt(0, 0).CenterPoint()).Length() -
-                       kReorderDroppingCircleRadius -
-                       kPreferredIconDimension / 2 + 5;
+                       kReorderDroppingCircleRadius - kGridIconDimension / 2 +
+                       5;
   gfx::Point to = gfx::Point(from.x() - reorder_offset, from.y());
 
   // Dragging item_1 closing to item_0 should leads to re-ordering these two
   // items.
   SimulateDrag(AppsGridView::MOUSE, from, to);
   apps_grid_view_->EndDrag(false);
   EXPECT_EQ(2u, model_->top_level_item_list()->item_count());
   EXPECT_EQ(std::string("Item 1,Item 0"), model_->GetModelContent());
   test_api_->LayoutToIdealBounds();
 }
@@ skipping 263 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