Refactor app list so AppsGridView owns the PaginationModel.

ui/app_list/views/app_list_main_view_unittest.cc

 // Copyright 2013 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/app_list_main_view.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/app_list/pagination_model.h"
 #include "ui/app_list/test/app_list_test_model.h"
 #include "ui/app_list/test/app_list_test_view_delegate.h"
 #include "ui/app_list/views/app_list_folder_view.h"
 #include "ui/app_list/views/app_list_item_view.h"
 #include "ui/app_list/views/apps_container_view.h"
 #include "ui/app_list/views/apps_grid_view.h"
 #include "ui/app_list/views/contents_view.h"
 #include "ui/app_list/views/test/apps_grid_view_test_api.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/view_model.h"
@@ skipping 44 matching lines @@
       : widget_(NULL),
         main_view_(NULL) {}
 
   virtual ~AppListMainViewTest() {}
 
   // testing::Test overrides:
   virtual void SetUp() OVERRIDE {
     views::ViewsTestBase::SetUp();
     delegate_.reset(new AppListTestViewDelegate);
 
-    main_view_ =
-        new AppListMainView(delegate_.get(), &pagination_model_, GetContext());
+    main_view_ = new AppListMainView(delegate_.get(), 0, GetContext());
     main_view_->SetPaintToLayer(true);
 
     widget_ = new views::Widget;
     views::Widget::InitParams params =
         CreateParams(views::Widget::InitParams::TYPE_POPUP);
     params.bounds.set_size(main_view_->GetPreferredSize());
     widget_->Init(params);
 
     widget_->SetContentsView(main_view_);
   }
@@ skipping 74 matching lines @@
     return RootGridView()->view_model_for_test();
   }
 
   const views::ViewModel* FolderViewModel() {
     return FolderGridView()->view_model_for_test();
   }
 
  protected:
   views::Widget* widget_;  // Owned by native window.
   AppListMainView* main_view_;  // Owned by |widget_|.
-  PaginationModel pagination_model_;
   scoped_ptr<AppListTestViewDelegate> delegate_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AppListMainViewTest);
 };
 
 }  // namespace
 
 // Tests changing the AppListModel when switching profiles.
 TEST_F(AppListMainViewTest, ModelChanged) {
@@ skipping 84 matching lines @@
   root_grid_view_test_api.LayoutToIdealBounds();
   EXPECT_EQ(first_slot_tile, RootViewModel()->view_at(0)->bounds());
 
   // Single item folder should be auto removed.
   EXPECT_EQ(NULL,
             delegate_->GetTestModel()->FindFolderItem("single_item_folder"));
 }
 
 }  // namespace test
 }  // namespace app_list