Refactor app list so AppsGridView owns the PaginationModel.

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 88 matching lines @@
 
 class AppsGridViewTest : public views::ViewsTestBase {
  public:
   AppsGridViewTest() {}
   virtual ~AppsGridViewTest() {}
 
   // testing::Test overrides:
   virtual void SetUp() OVERRIDE {
     views::ViewsTestBase::SetUp();
     model_.reset(new AppListTestModel);
-    pagination_model_.reset(new PaginationModel);
 
-    apps_grid_view_.reset(new AppsGridView(NULL, pagination_model_.get()));
+    apps_grid_view_.reset(new AppsGridView(NULL));
     apps_grid_view_->SetLayout(kIconDimension, 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 23 matching lines @@
   gfx::Rect GetItemTileRectAt(int row, int col) {
     DCHECK_GT(model_->top_level_item_list()->item_count(), 0u);
 
     gfx::Insets insets(apps_grid_view_->GetInsets());
     gfx::Rect rect(gfx::Point(insets.left(), insets.top()),
                    GetItemViewAt(0)->bounds().size());
     rect.Offset(col * rect.width(), row * rect.height());
     return rect;
   }
 
+  PaginationModel* GetPaginationModel() {
+    return apps_grid_view_->pagination_model();
+  }
+
   // Points are in |apps_grid_view_|'s coordinates.
   void SimulateDrag(AppsGridView::Pointer pointer,
                     const gfx::Point& from,
                     const gfx::Point& to) {
     AppListItemView* view = GetItemViewForPoint(from);
     DCHECK(view);
 
     gfx::Point translated_from = gfx::PointAtOffsetFromOrigin(
         from - view->bounds().origin());
     gfx::Point translated_to = gfx::PointAtOffsetFromOrigin(
         to - view->bounds().origin());
 
     ui::MouseEvent pressed_event(ui::ET_MOUSE_PRESSED,
                                  translated_from, from, 0, 0);
     apps_grid_view_->InitiateDrag(view, pointer, pressed_event);
 
     ui::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED,
                               translated_to, to, 0, 0);
     apps_grid_view_->UpdateDragFromItem(pointer, drag_event);
   }
 
   void SimulateKeyPress(ui::KeyboardCode key_code) {
     ui::KeyEvent key_event(ui::ET_KEY_PRESSED, key_code, 0, false);
     apps_grid_view_->OnKeyPressed(key_event);
   }
 
   scoped_ptr<AppListTestModel> model_;
-  scoped_ptr<PaginationModel> pagination_model_;
   scoped_ptr<AppsGridView> apps_grid_view_;
   scoped_ptr<AppsGridViewTestApi> test_api_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AppsGridViewTest);
 };
 
 class TestAppsGridViewFolderDelegate : public AppsGridViewFolderDelegate {
  public:
   TestAppsGridViewFolderDelegate() : show_bubble_(false) {}
@@ skipping 30 matching lines @@
  private:
   bool show_bubble_;
 
   DISALLOW_COPY_AND_ASSIGN(TestAppsGridViewFolderDelegate);
 };
 
 TEST_F(AppsGridViewTest, CreatePage) {
   // Fully populates a page.
   const int kPages = 1;
   model_->PopulateApps(kPages * kTilesPerPage);
-  EXPECT_EQ(kPages, pagination_model_->total_pages());
+  EXPECT_EQ(kPages, GetPaginationModel()->total_pages());
 
   // Adds one more and gets a new page created.
   model_->CreateAndAddItem("Extra");
-  EXPECT_EQ(kPages + 1, pagination_model_->total_pages());
+  EXPECT_EQ(kPages + 1, GetPaginationModel()->total_pages());
 }
 
 TEST_F(AppsGridViewTest, EnsureHighlightedVisible) {
   const int kPages = 3;
   model_->PopulateApps(kPages * kTilesPerPage);
-  EXPECT_EQ(kPages, pagination_model_->total_pages());
-  EXPECT_EQ(0, pagination_model_->selected_page());
+  EXPECT_EQ(kPages, GetPaginationModel()->total_pages());
+  EXPECT_EQ(0, GetPaginationModel()->selected_page());
 
   // Highlight first one and last one one first page and first page should be
   // selected.
   model_->HighlightItemAt(0);
-  EXPECT_EQ(0, pagination_model_->selected_page());
+  EXPECT_EQ(0, GetPaginationModel()->selected_page());
   model_->HighlightItemAt(kTilesPerPage - 1);
-  EXPECT_EQ(0, pagination_model_->selected_page());
+  EXPECT_EQ(0, GetPaginationModel()->selected_page());
 
   // Highlight first one on 2nd page and 2nd page should be selected.
   model_->HighlightItemAt(kTilesPerPage + 1);
-  EXPECT_EQ(1, pagination_model_->selected_page());
+  EXPECT_EQ(1, GetPaginationModel()->selected_page());
 
   // Highlight last one in the model and last page should be selected.
   model_->HighlightItemAt(model_->top_level_item_list()->item_count() - 1);
-  EXPECT_EQ(kPages - 1, pagination_model_->selected_page());
+  EXPECT_EQ(kPages - 1, GetPaginationModel()->selected_page());
 }
 
 TEST_F(AppsGridViewTest, RemoveSelectedLastApp) {
   const int kTotalItems = 2;
   const int kLastItemIndex = kTotalItems - 1;
 
   model_->PopulateApps(kTotalItems);
 
   AppListItemView* last_view = GetItemViewAt(kLastItemIndex);
   apps_grid_view_->SetSelectedView(last_view);
@@ skipping 224 matching lines @@
   SimulateDrag(AppsGridView::MOUSE, from, to);
   model_->CreateAndAddItem("Extra");
   apps_grid_view_->EndDrag(false);
   EXPECT_EQ(std::string("Item 0,Item 1,Item 3,Extra"),
             model_->GetModelContent());
   test_api_->LayoutToIdealBounds();
 }
 
 TEST_F(AppsGridViewTest, MouseDragFlipPage) {
   test_api_->SetPageFlipDelay(10);
-  pagination_model_->SetTransitionDurations(10, 10);
+  GetPaginationModel()->SetTransitionDurations(10, 10);
 
-  PageFlipWaiter page_flip_waiter(message_loop(),
-                                  pagination_model_.get());
+  PageFlipWaiter page_flip_waiter(message_loop(), GetPaginationModel());
 
   const int kPages = 3;
   model_->PopulateApps(kPages * kTilesPerPage);
-  EXPECT_EQ(kPages, pagination_model_->total_pages());
-  EXPECT_EQ(0, pagination_model_->selected_page());
+  EXPECT_EQ(kPages, GetPaginationModel()->total_pages());
+  EXPECT_EQ(0, GetPaginationModel()->selected_page());
 
   gfx::Point from = GetItemTileRectAt(0, 0).CenterPoint();
   gfx::Point to = gfx::Point(apps_grid_view_->width(),
                              apps_grid_view_->height() / 2);
 
   // Drag to right edge.
   SimulateDrag(AppsGridView::MOUSE, from, to);
 
   // Page should be flipped after sometime.
   EXPECT_TRUE(page_flip_waiter.Wait(0));
-  EXPECT_EQ(1, pagination_model_->selected_page());
+  EXPECT_EQ(1, GetPaginationModel()->selected_page());
 
   // Stay there and page should be flipped again.
   EXPECT_TRUE(page_flip_waiter.Wait(0));
-  EXPECT_EQ(2, pagination_model_->selected_page());
+  EXPECT_EQ(2, GetPaginationModel()->selected_page());
 
   // Stay there longer and no page flip happen since we are at the last page.
   EXPECT_FALSE(page_flip_waiter.Wait(100));
-  EXPECT_EQ(2, pagination_model_->selected_page());
+  EXPECT_EQ(2, GetPaginationModel()->selected_page());
 
   apps_grid_view_->EndDrag(true);
 
   // Now drag to the left edge and test the other direction.
   to.set_x(0);
 
   SimulateDrag(AppsGridView::MOUSE, from, to);
 
   EXPECT_TRUE(page_flip_waiter.Wait(0));
-  EXPECT_EQ(1, pagination_model_->selected_page());
+  EXPECT_EQ(1, GetPaginationModel()->selected_page());
 
   EXPECT_TRUE(page_flip_waiter.Wait(0));
-  EXPECT_EQ(0, pagination_model_->selected_page());
+  EXPECT_EQ(0, GetPaginationModel()->selected_page());
 
   EXPECT_FALSE(page_flip_waiter.Wait(100));
-  EXPECT_EQ(0, pagination_model_->selected_page());
+  EXPECT_EQ(0, GetPaginationModel()->selected_page());
   apps_grid_view_->EndDrag(true);
 }
 
 TEST_F(AppsGridViewTest, SimultaneousDragWithFolderDisabled) {
   CommandLine::ForCurrentProcess()->AppendSwitch(switches::kDisableSyncAppList);
   const int kTotalItems = 4;
   model_->PopulateApps(kTotalItems);
   EXPECT_EQ(std::string("Item 0,Item 1,Item 2,Item 3"),
             model_->GetModelContent());
 
@@ skipping 111 matching lines @@
       last_index)));
   apps_grid_view_->SetSelectedView(GetItemViewAt(last_index_on_page2_last_row));
   SimulateKeyPress(ui::VKEY_NEXT);
   EXPECT_TRUE(apps_grid_view_->IsSelectedView(GetItemViewAt(
       last_index)));
 
 
 
   // After page switch, arrow keys select first item on current page.
   apps_grid_view_->SetSelectedView(GetItemViewAt(first_index));
-  pagination_model_->SelectPage(1, false);
+  GetPaginationModel()->SelectPage(1, false);
   SimulateKeyPress(ui::VKEY_UP);
   EXPECT_TRUE(apps_grid_view_->IsSelectedView(GetItemViewAt(
       first_index_on_page2)));
 }
 
 TEST_F(AppsGridViewTest, ItemLabelShortNameOverride) {
   // If the app's full name and short name differ, the title label's tooltip
   // should always be the full name of the app.
   std::string expected_text("xyz");
   std::string expected_tooltip("tooltip");
@@ skipping 21 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