Refactor app list so AppsGridView owns the PaginationModel.

ui/app_list/views/apps_grid_view_unittest.cc

Index: ui/app_list/views/apps_grid_view_unittest.cc
diff --git a/ui/app_list/views/apps_grid_view_unittest.cc b/ui/app_list/views/apps_grid_view_unittest.cc
index d93943d9c6270f775407df0ce4a8a8c6e0eebb4c..e58cb8c4b22c4e6ef13bd7550a816dc6440b0909 100644
--- a/ui/app_list/views/apps_grid_view_unittest.cc
+++ b/ui/app_list/views/apps_grid_view_unittest.cc
@@ -99,22 +99,23 @@ class PageFlipWaiter : public PaginationModelObserver {
 
 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.
@@ -179,10 +180,11 @@ class AppsGridViewTest : public views::ViewsTestBase {
   }
 
   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);
 };
@@ -503,8 +505,7 @@ 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);