Refactor app list so AppsGridView owns the PaginationModel.

ui/app_list/views/app_list_view_unittest.cc

 // Copyright 2014 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_view.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 81 matching lines @@
     return test_type_ == LANDSCAPE || test_type_ == EXPERIMENTAL;
   }
 
  private:
   // Shows the app list and waits until a paint occurs.
   void Show();
 
   // Closes the app list. This sets |view_| to NULL.
   void Close();
 
+  // Gets the PaginationModel owned by |view_|.
+  PaginationModel* PaginationModel() const;

[xiyuan, 2014/05/30 15:47:47]

nit: accessor should be named in lower case, like pagination_model. And no
"const" because it does not return a const object.

[Matt Giuca, 2014/06/02 07:11:23]

const: done.
lowercase: My reading of the style guide is that this only applies to methods
that simply return an attribute. This is a more complex getter. I think the
correct thing to do is to keep CamelCase but add "Get" to the front.

+
   const TestType test_type_;
   scoped_ptr<base::RunLoop> run_loop_;
-  PaginationModel pagination_model_;
   app_list::AppListView* view_;  // Owned by native widget.
   app_list::test::AppListTestViewDelegate* delegate_;  // Owned by |view_|;
 
   DISALLOW_COPY_AND_ASSIGN(AppListViewTestContext);
 };
 
 // Extend the regular AppListTestViewDelegate to communicate back to the test
 // context. Note the test context doesn't simply inherit this, because the
 // delegate is owned by the view.
 class UnitTestViewDelegate : public app_list::test::AppListTestViewDelegate {
@@ skipping 31 matching lines @@
     default:
       NOTREACHED();
       break;
   }
 
   delegate_ = new UnitTestViewDelegate(this);
   view_ = new app_list::AppListView(delegate_);
 
   // Initialize centered around a point that ensures the window is wholly shown.
   view_->InitAsBubbleAtFixedLocation(parent,
-                                     &pagination_model_,
                                      gfx::Point(300, 300),
                                      views::BubbleBorder::FLOAT,
                                      false /* border_accepts_events */);
 }
 
 AppListViewTestContext::~AppListViewTestContext() {
   // The view observes the PaginationModel which is about to get destroyed, so
   // if the view is not already deleted by the time this destructor is called,
   // there will be problems.
   EXPECT_FALSE(view_);
@@ skipping 18 matching lines @@
 
 void AppListViewTestContext::Close() {
   view_->GetWidget()->Close();
   run_loop_.reset(new base::RunLoop);
   run_loop_->Run();
 
   // |view_| should have been deleted and set to NULL via ViewClosing().
   EXPECT_FALSE(view_);
 }
 
+PaginationModel* AppListViewTestContext::PaginationModel() const {
+  return view_->app_list_main_view()
+      ->contents_view()
+      ->apps_container_view()
+      ->apps_grid_view()
+      ->GetPaginationModel();
+}
+
 void AppListViewTestContext::RunDisplayTest() {
   EXPECT_FALSE(view_->GetWidget()->IsVisible());
-  EXPECT_EQ(-1, pagination_model_.total_pages());
+  EXPECT_EQ(-1, PaginationModel()->total_pages());
   delegate_->GetTestModel()->PopulateApps(kInitialItems);
 
   Show();
   if (is_landscape())
-    EXPECT_EQ(2, pagination_model_.total_pages());
+    EXPECT_EQ(2, PaginationModel()->total_pages());
   else
-    EXPECT_EQ(3, pagination_model_.total_pages());
-  EXPECT_EQ(0, pagination_model_.selected_page());
+    EXPECT_EQ(3, PaginationModel()->total_pages());
+  EXPECT_EQ(0, PaginationModel()->selected_page());
 
   // Checks on the main view.
   AppListMainView* main_view = view_->app_list_main_view();
   EXPECT_NO_FATAL_FAILURE(CheckView(main_view));
   EXPECT_NO_FATAL_FAILURE(CheckView(main_view->search_box_view()));
   EXPECT_NO_FATAL_FAILURE(CheckView(main_view->contents_view()));
 
   Close();
 }
 
 void AppListViewTestContext::RunReshowWithOpenFolderTest() {
   EXPECT_FALSE(view_->GetWidget()->IsVisible());
-  EXPECT_EQ(-1, pagination_model_.total_pages());
+  EXPECT_EQ(-1, PaginationModel()->total_pages());
 
   AppListTestModel* model = delegate_->GetTestModel();
   model->PopulateApps(kInitialItems);
   const std::string folder_id =
       model->MergeItems(model->top_level_item_list()->item_at(0)->id(),
                         model->top_level_item_list()->item_at(1)->id());
 
   AppListFolderItem* folder_item = model->FindFolderItem(folder_id);
   EXPECT_TRUE(folder_item);
 
@@ skipping 23 matching lines @@
   // The main grid view should be showing after a reshow.
   EXPECT_NO_FATAL_FAILURE(CheckView(main_view));
   EXPECT_NO_FATAL_FAILURE(CheckView(container_view->apps_grid_view()));
   EXPECT_FALSE(container_view->app_list_folder_view()->visible());
 
   Close();
 }
 
 void AppListViewTestContext::RunStartPageTest() {
   EXPECT_FALSE(view_->GetWidget()->IsVisible());
-  EXPECT_EQ(-1, pagination_model_.total_pages());
+  EXPECT_EQ(-1, PaginationModel()->total_pages());
   AppListTestModel* model = delegate_->GetTestModel();
   model->PopulateApps(3);
 
   Show();
 
   AppListMainView* main_view = view_->app_list_main_view();
   StartPageView* start_page_view =
       main_view->contents_view()->start_page_view();
   // Checks on the main view.
   EXPECT_NO_FATAL_FAILURE(CheckView(main_view));
@@ skipping 144 matching lines @@
 INSTANTIATE_TEST_CASE_P(AppListViewTestAuraInstance,
                         AppListViewTestAura,
                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));
 
 INSTANTIATE_TEST_CASE_P(AppListViewTestDesktopInstance,
                         AppListViewTestDesktop,
                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));
 
 }  // namespace test
 }  // namespace app_list