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

chrome/browser/ui/app_list/app_list_service_views_browsertest.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 "chrome/browser/ui/app_list/app_list_service_views.h"
 
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "build/build_config.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/lifetime/keep_alive_registry.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
 #include "chrome/browser/ui/app_list/test/chrome_app_list_test_support.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_utils.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/events/test/event_generator.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/shell.h"
-#include "chrome/browser/ui/ash/app_list/test/app_list_service_ash_test_api.h"
+#include "ash/test/app_list_controller_test_api.h"
 #endif
 
 namespace {
 
 app_list::AppListView* GetAppListView(AppListService* service) {
 #if defined(OS_CHROMEOS)
-  return AppListServiceAshTestApi().GetAppListView();
+  return ash::test::AppListControllerTestApi(ash::Shell::GetInstance()).view();
 #else
   return static_cast<AppListServiceViews*>(service)->shower().app_list();
 #endif
 }
 
 }  // namespace
 
 namespace test {
 
 // Allow access to private variables of the AppListView for testing.
@@ skipping 186 matching lines @@
 
   service->ShowForAppInstall(browser()->profile(), extension->id(), false);
   app_list::AppListView* app_list_view = GetAppListView(service);
   ASSERT_TRUE(app_list_view);
 
   app_list::ContentsView* contents_view =
       app_list_view->app_list_main_view()->contents_view();
 
   EXPECT_TRUE(contents_view->IsStateActive(app_list::AppListModel::STATE_APPS));
 }