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

chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

 // Copyright 2013 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/ash/launcher/chrome_launcher_controller.h"
 
 #include <stddef.h>
 
 #include "ash/ash_switches.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_button.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_model.h"
 #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"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/extensions/extension_service.h"
 #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"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/extensions/app_launch_params.h"
@@ skipping 73 matching lines @@
 // Click the "All Apps" button from the app launcher start page. Assumes that
 // the app launcher is open to the start page. On the non-experimental launcher,
 // does nothing.
 // |display_origin| is the top-left corner of the active display, in screen
 // coordinates.
 void ClickAllAppsButtonFromStartPage(ui::test::EventGenerator* generator,
                                      const gfx::Point& display_origin) {
   if (!app_list::switches::IsExperimentalAppListEnabled())
     return;
 
-  AppListServiceAshTestApi service_test;
+  ash::test::AppListControllerTestApi controller_test(
+      ash::Shell::GetInstance());
 
-  app_list::StartPageView* start_page_view = service_test.GetStartPageView();
+  app_list::StartPageView* start_page_view = controller_test.GetStartPageView();
   DCHECK(start_page_view);
 
   app_list::TileItemView* all_apps_button = start_page_view->all_apps_button();
   gfx::Rect all_apps_rect = all_apps_button->GetBoundsInScreen();
   all_apps_rect.Offset(-display_origin.x(), -display_origin.y());
   generator->MoveMouseTo(all_apps_rect.CenterPoint().x(),
                          all_apps_rect.CenterPoint().y());
   generator->ClickLeftButton();
   base::MessageLoop::current()->RunUntilIdle();
   // Run Layout() to effectively complete the animation to the apps page.
-  service_test.LayoutContentsView();
+  controller_test.LayoutContentsView();
 }
 
 // Find the browser that associated with |app_name|.
 Browser* FindBrowserForApp(const std::string& app_name) {
   for (auto* browser : *BrowserList::GetInstance()) {
     std::string browser_app_name =
         web_app::GetExtensionIdFromApplicationName(browser->app_name());
     if (browser_app_name == app_name)
       return browser;
   }
@@ skipping 1465 matching lines @@
   // Open the app list menu and check that the drag and drop host was set.
   gfx::Rect app_list_bounds =
       test.shelf_view()->GetAppListButtonView()->GetBoundsInScreen();
   generator.MoveMouseTo(app_list_bounds.CenterPoint().x(),
                         app_list_bounds.CenterPoint().y());
   base::MessageLoop::current()->RunUntilIdle();
   generator.ClickLeftButton();
 
   EXPECT_TRUE(service->IsAppListVisible());
   app_list::AppsGridView* grid_view =
-      AppListServiceAshTestApi().GetRootGridView();
+      ash::test::AppListControllerTestApi(ash::Shell::GetInstance()).
+          GetRootGridView();
   ASSERT_TRUE(grid_view);
   ASSERT_TRUE(grid_view->has_drag_and_drop_host_for_test());
 
   // There should be 2 items in our application list.
   const views::ViewModelT<app_list::AppListItemView>* vm_grid =
       grid_view->view_model_for_test();
   EXPECT_EQ(2, vm_grid->view_size());
 
   // Test #1: Drag an app list which does not exist yet item into the
   // launcher. Keeping it dragged, see that a new item gets created. Continuing
@@ skipping 133 matching lines @@
                         app_list_bounds.CenterPoint().y());
   generator.ClickLeftButton();
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_TRUE(service->IsAppListVisible());
 
   // Click the "all apps" button on the start page.
   ClickAllAppsButtonFromStartPage(&generator, origin);
   EXPECT_TRUE(service->IsAppListVisible());
 
   app_list::AppsGridView* grid_view =
-      AppListServiceAshTestApi().GetRootGridView();
+      ash::test::AppListControllerTestApi(ash::Shell::GetInstance()).
+          GetRootGridView();
   ASSERT_TRUE(grid_view);
   ASSERT_TRUE(grid_view->has_drag_and_drop_host_for_test());
 
   // There should be 2 items in our application list.
   const views::ViewModelT<app_list::AppListItemView>* vm_grid =
       grid_view->view_model_for_test();
   EXPECT_EQ(2, vm_grid->view_size());
 
   // Drag an app list item which does not exist yet in the shelf.
   // Keeping it dragged, see that a new item gets created.
@@ skipping 162 matching lines @@
   generator.ClickLeftButton();
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_TRUE(service->IsAppListVisible());
 
   // Click the "all apps" button on the start page.
   ClickAllAppsButtonFromStartPage(&generator, gfx::Point());
   EXPECT_TRUE(service->IsAppListVisible());
 
   // Click an app icon in the app grid view.
   app_list::AppsGridView* grid_view =
-      AppListServiceAshTestApi().GetRootGridView();
+      ash::test::AppListControllerTestApi(ash::Shell::GetInstance()).
+          GetRootGridView();
   ASSERT_TRUE(grid_view);
   const views::ViewModelT<app_list::AppListItemView>* vm_grid =
       grid_view->view_model_for_test();
   EXPECT_EQ(2, vm_grid->view_size());
   gfx::Rect bounds_grid_1 = vm_grid->view_at(1)->GetBoundsInScreen();
   // Test now that a click does create a new application tab.
   TabStripModel* tab_strip = browser()->tab_strip_model();
   int tab_count = tab_strip->count();
   generator.MoveMouseTo(bounds_grid_1.CenterPoint().x(),
                         bounds_grid_1.CenterPoint().y());
@@ skipping 255 matching lines @@
   controller_->ActivateApp(bookmark_app->id(), ash::LAUNCH_FROM_APP_LIST, 0);
 
   // There should be two new browsers.
   EXPECT_EQ(3u, chrome::GetBrowserCount(browser()->profile()));
 
   // The apps should now be running, with the last opened app active.
   EXPECT_EQ(ash::STATUS_RUNNING, model_->ItemByID(hosted_app_shelf_id)->status);
   EXPECT_EQ(ash::STATUS_ACTIVE,
             model_->ItemByID(bookmark_app_shelf_id)->status);
 }