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 @@
     // The app list should have loaded instantly since the profile is already
     // loaded.
     EXPECT_TRUE(service->IsAppListVisible());
     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) {
+  void SetActiveStateAndVerify(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->SetActiveState(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->SetActiveState(
+        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->SetActiveState(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 31 matching lines @@
   event_generator.ClickLeftButton();
   EXPECT_TRUE(
       contents_view->IsStateActive(app_list::AppListModel::STATE_START));
   // Click again with it enabled. The active state should update immediately.
   SetCustomLauncherPageEnabled(true);
   event_generator.ClickLeftButton();
   EXPECT_TRUE(contents_view->IsStateActive(
       app_list::AppListModel::STATE_CUSTOM_LAUNCHER_PAGE));
 
   // Back to the start page. And send a mouse wheel event.
-  SetActivePageAndVerify(app_list::AppListModel::STATE_START);
+  SetActiveStateAndVerify(app_list::AppListModel::STATE_START);
   // Generate wheel events above the clickzone.
   event_generator.MoveMouseRelativeTo(window, point_above_clickzone);
   // Scrolling left, right or up should do nothing.
   event_generator.MoveMouseWheel(-5, 0);
   event_generator.MoveMouseWheel(5, 0);
   event_generator.MoveMouseWheel(0, 5);
   EXPECT_TRUE(
       contents_view->IsStateActive(app_list::AppListModel::STATE_START));
   // Scroll down to open launcher page.
   event_generator.MoveMouseWheel(0, -5);
@@ skipping 10 matching lines @@
   // Widget is the host, so nothing needs to be done. On ChromeOS, the points
   // need to be put into screen coordinates. This works because the root window
   // assumes it fills the screen.
   point_in_clickzone = bounds.CenterPoint();
   point_above_clickzone.SetPoint(point_in_clickzone.x(), bounds.y() - 10);
   views::View::ConvertPointToScreen(contents_view, &point_above_clickzone);
   views::View::ConvertPointToScreen(contents_view, &point_in_clickzone);
 #endif
 
   // Back to the start page. And send a scroll gesture.
-  SetActivePageAndVerify(app_list::AppListModel::STATE_START);
+  SetActiveStateAndVerify(app_list::AppListModel::STATE_START);
   // Going down should do nothing.
   event_generator.GestureScrollSequence(
       point_above_clickzone, point_in_clickzone, step_delay, num_steps);
   EXPECT_TRUE(
       contents_view->IsStateActive(app_list::AppListModel::STATE_START));
   // Now go up - should change state.
   event_generator.GestureScrollSequence(
       point_in_clickzone, point_above_clickzone, step_delay, num_steps);
   EXPECT_TRUE(contents_view->IsStateActive(
       app_list::AppListModel::STATE_CUSTOM_LAUNCHER_PAGE));
 
   // Back to the start page. And send a trackpad scroll event.
-  SetActivePageAndVerify(app_list::AppListModel::STATE_START);
+  SetActiveStateAndVerify(app_list::AppListModel::STATE_START);
   // Going down left, right or up should do nothing.
   event_generator.ScrollSequence(point_in_clickzone, step_delay, -5, 0,
                                  num_steps, num_fingers);
   event_generator.ScrollSequence(point_in_clickzone, step_delay, 5, 0,
                                  num_steps, num_fingers);
   event_generator.ScrollSequence(point_in_clickzone, step_delay, 0, 5,
                                  num_steps, num_fingers);
   EXPECT_TRUE(
       contents_view->IsStateActive(app_list::AppListModel::STATE_START));
   // Scroll up to open launcher page.
   event_generator.ScrollSequence(point_in_clickzone, step_delay, 0, -5,
                                  num_steps, num_fingers);
   EXPECT_TRUE(contents_view->IsStateActive(
       app_list::AppListModel::STATE_CUSTOM_LAUNCHER_PAGE));
 
   // Back to the start page. And send a tap gesture.
-  SetActivePageAndVerify(app_list::AppListModel::STATE_START);
+  SetActiveStateAndVerify(app_list::AppListModel::STATE_START);
   // Tapping outside the clickzone should do nothing.
   event_generator.GestureTapAt(point_above_clickzone);
   EXPECT_TRUE(
       contents_view->IsStateActive(app_list::AppListModel::STATE_START));
   // Now tap in the clickzone.
   event_generator.GestureTapAt(point_in_clickzone);
   EXPECT_TRUE(contents_view->IsStateActive(
       app_list::AppListModel::STATE_CUSTOM_LAUNCHER_PAGE));
 }
 
 IN_PROC_BROWSER_TEST_F(CustomLauncherPageBrowserTest, LauncherPageSubpages) {
   LoadAndLaunchPlatformApp(kCustomLauncherPagePath, "Launched");
 
   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->SetActiveState(
+        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 105 matching lines @@
   app_list::SearchBoxView* search_box_view =
       app_list_view->app_list_main_view()->search_box_view();
 
   ASSERT_TRUE(
       contents_view->IsStateActive(app_list::AppListModel::STATE_START));
   EXPECT_EQ(app_list_view->GetFocusManager()->GetFocusedView(),
             search_box_view->search_box());
 
   {
     ExtensionTestMessageListener listener("onPageProgressAt1", false);
-    contents_view->SetActivePage(contents_view->GetPageIndexForState(
-        app_list::AppListModel::STATE_CUSTOM_LAUNCHER_PAGE));
+    contents_view->SetActiveState(
+        app_list::AppListModel::STATE_CUSTOM_LAUNCHER_PAGE);
     listener.WaitUntilSatisfied();
     EXPECT_TRUE(contents_view->IsStateActive(
         app_list::AppListModel::STATE_CUSTOM_LAUNCHER_PAGE));
     EXPECT_EQ(app_list_view->GetFocusManager()->GetFocusedView(),
               search_box_view->search_box());
   }
   {
     ExtensionTestMessageListener listener("textfieldFocused", false);
     app_list_view->GetFocusManager()->AdvanceFocus(false);
     listener.WaitUntilSatisfied();
     EXPECT_NE(app_list_view->GetFocusManager()->GetFocusedView(),
               search_box_view->search_box());
   }
   {
     ExtensionTestMessageListener listener("textfieldBlurred", false);
     app_list_view->GetFocusManager()->AdvanceFocus(false);
     listener.WaitUntilSatisfied();
     EXPECT_EQ(app_list_view->GetFocusManager()->GetFocusedView(),
               search_box_view->search_box());
   }
 }