AppListController refactoring part 3: Switching over to use AppListShower in Ash.

chrome/browser/ui/ash/app_list/test/app_list_service_ash_test_api.cc

Index: chrome/browser/ui/ash/app_list/test/app_list_service_ash_test_api.cc
diff --git a/ash/test/app_list_controller_test_api.cc b/chrome/browser/ui/ash/app_list/test/app_list_service_ash_test_api.cc
similarity index 30%
rename from ash/test/app_list_controller_test_api.cc
rename to chrome/browser/ui/ash/app_list/test/app_list_service_ash_test_api.cc
index 6201e9ba4bd05919db1e979cd061f11c0d7d73f6..2bf51972aa15a07e2655fce630da6e9de1dd98fb 100644
--- a/ash/test/app_list_controller_test_api.cc
+++ b/chrome/browser/ui/ash/app_list/test/app_list_service_ash_test_api.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/test/app_list_controller_test_api.h"
+#include "chrome/browser/ui/ash/app_list/test/app_list_service_ash_test_api.h"
 
-#include "ash/test/shell_test_api.h"
-#include "ash/wm/app_list_controller.h"
+#include "chrome/browser/ui/ash/app_list/app_list_service_ash.h"
+#include "ui/app_list/shower/test/app_list_shower_impl_test_api.h"
 #include "ui/app_list/views/app_list_main_view.h"
 #include "ui/app_list/views/app_list_view.h"
 #include "ui/app_list/views/apps_container_view.h"
@@ -13,28 +13,33 @@
 #include "ui/app_list/views/contents_view.h"
 #include "ui/app_list/views/start_page_view.h"
 
-namespace ash {
-namespace test {
+AppListServiceAshTestApi::AppListServiceAshTestApi() {}
 
-AppListControllerTestApi::AppListControllerTestApi(Shell* shell)
-    : app_list_controller_(ShellTestApi(shell).app_list_controller()) {}
-
-app_list::AppsGridView* AppListControllerTestApi::GetRootGridView() const {
-  return view()->app_list_main_view()->contents_view()->
-      apps_container_view()->apps_grid_view();
+app_list::AppListShowerImpl* AppListServiceAshTestApi::GetAppListShower()
+    const {
+  return AppListServiceAsh::GetInstance()->app_list_shower_.get();
 }
 
-app_list::StartPageView* AppListControllerTestApi::GetStartPageView() const {
-  return view()->app_list_main_view()->contents_view()->start_page_view();
+app_list::AppListView* AppListServiceAshTestApi::GetAppListView() const {
+  app_list::test::AppListShowerImplTestApi shower_test_api(GetAppListShower());
+  return shower_test_api.view();
 }
 
-app_list::AppListView* AppListControllerTestApi::view() const {
-  return app_list_controller_->view_;
+app_list::AppsGridView* AppListServiceAshTestApi::GetRootGridView() const {
+  return GetAppListView()
+      ->app_list_main_view()
+      ->contents_view()
+      ->apps_container_view()
+      ->apps_grid_view();
 }
 
-void AppListControllerTestApi::LayoutContentsView() {
-  view()->app_list_main_view()->contents_view()->Layout();
+app_list::StartPageView* AppListServiceAshTestApi::GetStartPageView() const {
+  return GetAppListView()
+      ->app_list_main_view()
+      ->contents_view()
+      ->start_page_view();
 }
 
-}  // namespace test
-}  // namespace ash
+void AppListServiceAshTestApi::LayoutContentsView() {
+  GetAppListView()->app_list_main_view()->contents_view()->Layout();
+}