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 81 matching lines @@
   bool page_changed_;
   base::OneShotTimer<PageFlipWaiter> wait_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(PageFlipWaiter);
 };
 
 }  // namespace
 
 class AppsGridViewTest : public views::ViewsTestBase {
  public:
-  AppsGridViewTest() {}
+  AppsGridViewTest() : pagination_model_(NULL) {}
   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()));
+
+    pagination_model_ = apps_grid_view_->GetPaginationModel();
   }
   virtual void TearDown() OVERRIDE {
     apps_grid_view_.reset();  // Release apps grid view before models.
     views::ViewsTestBase::TearDown();
   }
 
  protected:
   void EnsureFoldersEnabled() {
     // Folders require AppList sync to be enabled.
     CommandLine::ForCurrentProcess()->AppendSwitch(
@@ skipping 44 matching lines @@
                               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_;
 
+  PaginationModel* pagination_model_;  // Owned by |apps_grid_view_|.
+
  private:
   DISALLOW_COPY_AND_ASSIGN(AppsGridViewTest);
 };
 
 class TestAppsGridViewFolderDelegate : public AppsGridViewFolderDelegate {
  public:
   TestAppsGridViewFolderDelegate() : show_bubble_(false) {}
   virtual ~TestAppsGridViewFolderDelegate() {}
 
   // Overridden from AppsGridViewFolderDelegate:
@@ skipping 300 matching lines @@
   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);
 
-  PageFlipWaiter page_flip_waiter(message_loop(),
-                                  pagination_model_.get());
+  PageFlipWaiter page_flip_waiter(message_loop(), pagination_model_);
 
   const int kPages = 3;
   model_->PopulateApps(kPages * kTilesPerPage);
   EXPECT_EQ(kPages, pagination_model_->total_pages());
   EXPECT_EQ(0, pagination_model_->selected_page());
 
   gfx::Point from = GetItemTileRectAt(0, 0).CenterPoint();
   gfx::Point to = gfx::Point(apps_grid_view_->width(),
                              apps_grid_view_->height() / 2);
 
@@ skipping 193 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