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

chrome/browser/apps/custom_launcher_page_browsertest_views.cc

Index: chrome/browser/apps/custom_launcher_page_browsertest_views.cc
diff --git a/chrome/browser/apps/custom_launcher_page_browsertest_views.cc b/chrome/browser/apps/custom_launcher_page_browsertest_views.cc
index c1b406975276177fab8e6380013af0cc5f5a9083..9cbd71dde6990e742b1cab4b2c45609fcb0dce23 100644
--- a/chrome/browser/apps/custom_launcher_page_browsertest_views.cc
+++ b/chrome/browser/apps/custom_launcher_page_browsertest_views.cc
@@ -4,7 +4,6 @@
 
 #include <string>
 
-#include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
@@ -24,11 +23,17 @@
 #include "ui/app_list/views/contents_view.h"
 #include "ui/app_list/views/custom_launcher_page_view.h"
 #include "ui/app_list/views/search_box_view.h"
+#include "ui/aura/window.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/focus/focus_manager.h"
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/ui/ash/app_list/test/app_list_service_ash_test_api.h"
+#include "ui/app_list/shower/app_list_shower_impl.h"
+#endif
+
 namespace {
 
 // The path of the test application within the "platform_apps" directory.
@@ -74,9 +79,9 @@ class CustomLauncherPageBrowserTest
   app_list::AppListView* GetAppListView() {
     app_list::AppListView* app_list_view = nullptr;
 #if defined(OS_CHROMEOS)
-    ash::Shell* shell = ash::Shell::GetInstance();
-    app_list_view = shell->GetAppListView();
-    EXPECT_TRUE(shell->GetAppListTargetVisibility());
+    AppListServiceAshTestApi service_test;
+    app_list_view = service_test.GetAppListView();
+    EXPECT_TRUE(service_test.GetAppListShower()->GetTargetVisibility());
 #else
     AppListServiceViews* service =
         static_cast<AppListServiceViews*>(AppListService::Get());