Change ContentsView::SetActivePage to use States rather than indexes.

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"
@@ skipping 260 matching lines @@
   delegate_->GetTestModel()->PopulateApps(2);
   main_widget_->Show();
 
   ui::test::EventGenerator generator(GetContext(),
                                      main_widget_->GetNativeWindow());
   AppListItemView* item0 = RootViewModel()->view_at(0);
   AppListItemView* item1 = RootViewModel()->view_at(1);
 
   // If experimental launcher, switch to All Apps page
   if (app_list::switches::IsExperimentalAppListEnabled()) {
-    GetContentsView()->SetActivePage(
-        GetContentsView()->GetPageIndexForState(AppListModel::STATE_APPS));
+    GetContentsView()->SetActiveState(AppListModel::STATE_APPS);
     GetContentsView()->Layout();
   }
 
   generator.MoveMouseTo(item0->GetBoundsInScreen().CenterPoint());
   EXPECT_TRUE(item0->is_highlighted());
   EXPECT_FALSE(item1->is_highlighted());
 
   generator.MoveMouseTo(item1->GetBoundsInScreen().CenterPoint());
   EXPECT_FALSE(item0->is_highlighted());
   EXPECT_TRUE(item1->is_highlighted());
@@ skipping 14 matching lines @@
 TEST_F(AppListMainViewTest, MAYBE_TapGestureToHighlight) {
   delegate_->GetTestModel()->PopulateApps(1);
   main_widget_->Show();
 
   ui::test::EventGenerator generator(GetContext(),
                                      main_widget_->GetNativeWindow());
   AppListItemView* item = RootViewModel()->view_at(0);
 
   // If experimental launcher, switch to All Apps page
   if (app_list::switches::IsExperimentalAppListEnabled()) {
-    GetContentsView()->SetActivePage(
-        GetContentsView()->GetPageIndexForState(AppListModel::STATE_APPS));
+    GetContentsView()->SetActiveState(AppListModel::STATE_APPS);
     GetContentsView()->Layout();
   }
 
   generator.set_current_location(item->GetBoundsInScreen().CenterPoint());
   generator.PressTouch();
   EXPECT_TRUE(item->is_highlighted());
 
   generator.ReleaseTouch();
   EXPECT_FALSE(item->is_highlighted());
 }
@@ skipping 35 matching lines @@
 
 // Tests dragging an item out of a single item folder and dropping it onto the
 // page switcher. Regression test for http://crbug.com/415530/.
 TEST_F(AppListMainViewTest, DragReparentItemOntoPageSwitcher) {
   // Number of apps to populate. Should provide more than 1 page of apps (6*4 =
   // 24).
   const int kNumApps = 30;
 
   // Ensure we are on the apps grid view page.
   app_list::ContentsView* contents_view = GetContentsView();
-  contents_view->SetActivePage(
-      contents_view->GetPageIndexForState(AppListModel::STATE_APPS));
+  contents_view->SetActiveState(AppListModel::STATE_APPS);
   contents_view->Layout();
 
   AppListItemView* folder_item_view = CreateAndOpenSingleItemFolder();
   const gfx::Rect first_slot_tile = folder_item_view->bounds();
 
   delegate_->GetTestModel()->PopulateApps(kNumApps);
 
   EXPECT_EQ(1, FolderViewModel()->view_size());
   EXPECT_EQ(kNumApps + 1, RootViewModel()->view_size());
 
@@ skipping 63 matching lines @@
   // The app list model should remain unchanged.
   EXPECT_EQ(1, FolderViewModel()->view_size());
   EXPECT_EQ(2, RootViewModel()->view_size());
   EXPECT_EQ(folder_id, RootGridView()->GetItemViewAt(0)->item()->id());
   EXPECT_NE(nullptr,
             delegate_->GetTestModel()->FindFolderItem("single_item_folder"));
 }
 
 }  // namespace test
 }  // namespace app_list