Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc |
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc |
index cc357013e0c8dace1fc1e915f62f6e0f7a6db203..d122799ebd3ed95ed839ca2a4be30ce6be48b931 100644 |
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc |
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc |
@@ -14,7 +14,6 @@ |
#include "ash/shelf/shelf_util.h" |
#include "ash/shelf/shelf_view.h" |
#include "ash/shell.h" |
-#include "ash/test/app_list_controller_test_api.h" |
#include "ash/test/shelf_test_api.h" |
#include "ash/test/shelf_view_test_api.h" |
#include "ash/test/shell_test_api.h" |
@@ -33,6 +32,7 @@ |
#include "chrome/browser/extensions/launch_util.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/ui/app_list/app_list_service.h" |
+#include "chrome/browser/ui/ash/app_list/test/app_list_service_ash_test_api.h" |
#include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h" |
#include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h" |
#include "chrome/browser/ui/ash/launcher/launcher_item_controller.h" |
@@ -126,10 +126,9 @@ void ClickAllAppsButtonFromStartPage(ui::test::EventGenerator* generator, |
if (!app_list::switches::IsExperimentalAppListEnabled()) |
return; |
- ash::test::AppListControllerTestApi controller_test( |
- ash::Shell::GetInstance()); |
+ AppListServiceAshTestApi service_test; |
- app_list::StartPageView* start_page_view = controller_test.GetStartPageView(); |
+ app_list::StartPageView* start_page_view = service_test.GetStartPageView(); |
DCHECK(start_page_view); |
app_list::TileItemView* all_apps_button = start_page_view->all_apps_button(); |
@@ -140,7 +139,7 @@ void ClickAllAppsButtonFromStartPage(ui::test::EventGenerator* generator, |
generator->ClickLeftButton(); |
base::MessageLoop::current()->RunUntilIdle(); |
// Run Layout() to effectively complete the animation to the apps page. |
- controller_test.LayoutContentsView(); |
+ service_test.LayoutContentsView(); |
} |
// Find the browser that associated with |app_name|. |
@@ -1625,8 +1624,7 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, DISABLED_DragAndDrop) { |
EXPECT_TRUE(service->IsAppListVisible()); |
app_list::AppsGridView* grid_view = |
- ash::test::AppListControllerTestApi(ash::Shell::GetInstance()). |
- GetRootGridView(); |
+ AppListServiceAshTestApi().GetRootGridView(); |
ASSERT_TRUE(grid_view); |
ASSERT_TRUE(grid_view->has_drag_and_drop_host_for_test()); |
@@ -1780,8 +1778,7 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTestWithMultiMonitor, |
EXPECT_TRUE(service->IsAppListVisible()); |
app_list::AppsGridView* grid_view = |
- ash::test::AppListControllerTestApi(ash::Shell::GetInstance()). |
- GetRootGridView(); |
+ AppListServiceAshTestApi().GetRootGridView(); |
ASSERT_TRUE(grid_view); |
ASSERT_TRUE(grid_view->has_drag_and_drop_host_for_test()); |
@@ -1964,8 +1961,7 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, ClickItem) { |
// Click an app icon in the app grid view. |
app_list::AppsGridView* grid_view = |
- ash::test::AppListControllerTestApi(ash::Shell::GetInstance()). |
- GetRootGridView(); |
+ AppListServiceAshTestApi().GetRootGridView(); |
ASSERT_TRUE(grid_view); |
const views::ViewModelT<app_list::AppListItemView>* vm_grid = |
grid_view->view_model_for_test(); |