Refactor app list ContentsView to use page indices, not show states.

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 265 matching lines @@
 
   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));
   EXPECT_NO_FATAL_FAILURE(CheckView(main_view->contents_view()));
   if (test_type_ == EXPERIMENTAL) {
     EXPECT_NO_FATAL_FAILURE(CheckView(start_page_view));
 
-    main_view->contents_view()->SetShowState(ContentsView::SHOW_START_PAGE);
-    main_view->contents_view()->Layout();
+    ContentsView* contents_view = main_view->contents_view();
+    contents_view->SetActivePage(
+        contents_view->GetPageIndexForNamedPage(ContentsView::SHOW_START_PAGE));
+    contents_view->Layout();
     EXPECT_FALSE(main_view->search_box_view()->visible());
     EXPECT_TRUE(IsViewAtOrigin(start_page_view));
-    EXPECT_FALSE(
-        IsViewAtOrigin(main_view->contents_view()->apps_container_view()));
+    EXPECT_FALSE(IsViewAtOrigin(contents_view->apps_container_view()));
     EXPECT_EQ(3u, GetVisibleTileItemViews(start_page_view->tile_views()));
 
-    main_view->contents_view()->SetShowState(ContentsView::SHOW_APPS);
-    main_view->contents_view()->Layout();
+    contents_view->SetActivePage(
+        contents_view->GetPageIndexForNamedPage(ContentsView::SHOW_APPS));
+    contents_view->Layout();
     EXPECT_TRUE(main_view->search_box_view()->visible());
     EXPECT_FALSE(IsViewAtOrigin(start_page_view));
-    EXPECT_TRUE(
-        IsViewAtOrigin(main_view->contents_view()->apps_container_view()));
+    EXPECT_TRUE(IsViewAtOrigin(contents_view->apps_container_view()));
 
     // Check tiles hide and show on deletion and addition.
     model->CreateAndAddItem("Test app");
     EXPECT_EQ(4u, GetVisibleTileItemViews(start_page_view->tile_views()));
     model->DeleteItem(model->GetItemName(0));
     EXPECT_EQ(3u, GetVisibleTileItemViews(start_page_view->tile_views()));
   } else {
     EXPECT_EQ(NULL, start_page_view);
   }
 
@@ skipping 169 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