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

ui/app_list/views/app_list_main_view_unittest.cc

Index: ui/app_list/views/app_list_main_view_unittest.cc
diff --git a/ui/app_list/views/app_list_main_view_unittest.cc b/ui/app_list/views/app_list_main_view_unittest.cc
index accc731b76c4abf51a03b35420199c0542709281..777bf81da6f13fd1a9907d3d43793a711c64c214 100644
--- a/ui/app_list/views/app_list_main_view_unittest.cc
+++ b/ui/app_list/views/app_list_main_view_unittest.cc
@@ -278,8 +278,7 @@ TEST_F(AppListMainViewTest, MouseHoverToHighlight) {
 
   // If experimental launcher, switch to All Apps page
   if (app_list::switches::IsExperimentalAppListEnabled()) {
-    GetContentsView()->SetActivePage(
-        GetContentsView()->GetPageIndexForState(AppListModel::STATE_APPS));
+    GetContentsView()->SetActivePage(AppListModel::STATE_APPS);
     GetContentsView()->Layout();
   }
 
@@ -314,8 +313,7 @@ TEST_F(AppListMainViewTest, MAYBE_TapGestureToHighlight) {
 
   // If experimental launcher, switch to All Apps page
   if (app_list::switches::IsExperimentalAppListEnabled()) {
-    GetContentsView()->SetActivePage(
-        GetContentsView()->GetPageIndexForState(AppListModel::STATE_APPS));
+    GetContentsView()->SetActivePage(AppListModel::STATE_APPS);
     GetContentsView()->Layout();
   }
 
@@ -371,8 +369,7 @@ TEST_F(AppListMainViewTest, DragReparentItemOntoPageSwitcher) {
 
   // 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->SetActivePage(AppListModel::STATE_APPS);
   contents_view->Layout();
 
   AppListItemView* folder_item_view = CreateAndOpenSingleItemFolder();