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

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/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/ui/app_list/app_list_service.h"
 #include "chrome/browser/ui/app_list/app_list_service_views.h"
 #include "chrome/browser/ui/app_list/app_list_shower_views.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/switches.h"
 #include "extensions/test/extension_test_message_listener.h"
 #include "ui/app_list/app_list_switches.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/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.
 const char kCustomLauncherPagePath[] = "custom_launcher_page";
 
 // The app ID of the test application.
 const char kCustomLauncherPageID[] = "lmadimbbgapmngbiclpjjngmdickadpl";
 
 }  // namespace
 
@@ skipping 25 matching lines @@
   // activate any loaded launcher pages).
   void LaunchPlatformApp(const extensions::Extension* /*unused*/) override {
     AppListService* service = AppListService::Get();
     DCHECK(service);
     service->ShowForProfile(browser()->profile());
   }
 
   app_list::AppListView* GetAppListView() {
     app_list::AppListView* app_list_view = nullptr;
 #if defined(OS_CHROMEOS)
-    AppListServiceAshTestApi service_test;
-    app_list_view = service_test.GetAppListView();
-    EXPECT_TRUE(service_test.GetAppListShower()->GetTargetVisibility());
+    ash::Shell* shell = ash::Shell::GetInstance();
+    app_list_view = shell->GetAppListView();
+    EXPECT_TRUE(shell->GetAppListTargetVisibility());
 #else
     AppListServiceViews* service =
         static_cast<AppListServiceViews*>(AppListService::Get());
     // 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;
   }
@@ skipping 365 matching lines @@
   // And in reverse.
   EXPECT_EQ(
       search_box_textfield,
       app_list_view->GetFocusManager()->GetNextFocusableView(
           custom_page_webview, custom_page_webview->GetWidget(), true, false));
   EXPECT_EQ(custom_page_webview,
             app_list_view->GetFocusManager()->GetNextFocusableView(
                 search_box_textfield, search_box_textfield->GetWidget(), true,
                 false));
 }