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

chrome/browser/apps/custom_launcher_page_browsertest_views.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 <string>
 
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
@@ skipping 70 matching lines @@
     app_list_view = service->shower().app_list();
 #endif
     return app_list_view;
   }
 
   // Set the active page on the app list, according to |state|. Does not wait
   // for any animation or custom page to complete.
   void SetActivePageAndVerify(app_list::AppListModel::State state) {
     app_list::ContentsView* contents_view =
         GetAppListView()->app_list_main_view()->contents_view();
-    contents_view->SetActivePage(contents_view->GetPageIndexForState(state));
+    contents_view->SetActivePage(state);
     EXPECT_TRUE(contents_view->IsStateActive(state));
   }
 
   void SetCustomLauncherPageEnabled(bool enabled) {
     const base::string16 kLauncherPageDisableScript =
         base::ASCIIToUTF16("disableCustomLauncherPage();");
     const base::string16 kLauncherPageEnableScript =
         base::ASCIIToUTF16("enableCustomLauncherPage();");
 
     app_list::ContentsView* contents_view =
@@ skipping 21 matching lines @@
   LoadAndLaunchPlatformApp(kCustomLauncherPagePath, "Launched");
   app_list::AppListView* app_list_view = GetAppListView();
   app_list::ContentsView* contents_view =
       app_list_view->app_list_main_view()->contents_view();
 
   ASSERT_TRUE(
       contents_view->IsStateActive(app_list::AppListModel::STATE_START));
 
   {
     ExtensionTestMessageListener listener("onPageProgressAt1", false);
-    contents_view->SetActivePage(contents_view->GetPageIndexForState(
-        app_list::AppListModel::STATE_CUSTOM_LAUNCHER_PAGE));
+    contents_view->SetActivePage(
+        app_list::AppListModel::STATE_CUSTOM_LAUNCHER_PAGE);
 
     listener.WaitUntilSatisfied();
   }
   {
     ExtensionTestMessageListener listener("onPageProgressAt0", false);
-    contents_view->SetActivePage(contents_view->GetPageIndexForState(
-        app_list::AppListModel::STATE_START));
+    contents_view->SetActivePage(app_list::AppListModel::STATE_START);
 
     listener.WaitUntilSatisfied();
   }
 }
 
 // Test that the app list will switch to the custom launcher page by sending a
 // click inside the clickzone, or a mouse scroll event.
 IN_PROC_BROWSER_TEST_F(CustomLauncherPageBrowserTest,
                        EventsActivateSwitchToCustomPage) {
   LoadAndLaunchPlatformApp(kCustomLauncherPagePath, "Launched");
@@ skipping 116 matching lines @@
   app_list::AppListView* app_list_view = GetAppListView();
   app_list::AppListModel* model = app_list_view->app_list_main_view()->model();
   app_list::ContentsView* contents_view =
       app_list_view->app_list_main_view()->contents_view();
 
   ASSERT_TRUE(
       contents_view->IsStateActive(app_list::AppListModel::STATE_START));
 
   {
     ExtensionTestMessageListener listener("onPageProgressAt1", false);
-    contents_view->SetActivePage(contents_view->GetPageIndexForState(
-        app_list::AppListModel::STATE_CUSTOM_LAUNCHER_PAGE));
+    contents_view->SetActivePage(
+        app_list::AppListModel::STATE_CUSTOM_LAUNCHER_PAGE);
     listener.WaitUntilSatisfied();
     EXPECT_TRUE(contents_view->IsStateActive(
         app_list::AppListModel::STATE_CUSTOM_LAUNCHER_PAGE));
     // The app pushes 2 subpages when the launcher page is shown.
     EXPECT_EQ(2, model->custom_launcher_page_subpage_depth());
   }
 
   // Pop the subpages.
   {
     ExtensionTestMessageListener listener("onPopSubpage", false);
@@ skipping 86 matching lines @@
   EXPECT_TRUE(custom_page_view->visible());
 
   SetCustomLauncherPageEnabled(false);
   EXPECT_FALSE(model->custom_launcher_page_enabled());
   EXPECT_FALSE(custom_page_view->visible());
 
   SetCustomLauncherPageEnabled(true);
   EXPECT_TRUE(model->custom_launcher_page_enabled());
   EXPECT_TRUE(custom_page_view->visible());
 }