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

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

Index: chrome/browser/ui/ash/app_list/test/app_list_service_ash_test_api.h
diff --git a/ash/test/app_list_controller_test_api.h b/chrome/browser/ui/ash/app_list/test/app_list_service_ash_test_api.h
similarity index 45%
rename from ash/test/app_list_controller_test_api.h
rename to chrome/browser/ui/ash/app_list/test/app_list_service_ash_test_api.h
index b0fadc368d5eeab95dd5aad2118c0e5a99d0c2af..f51bb83750cce763d3917b80e69671882478cdb0 100644
--- a/ash/test/app_list_controller_test_api.h
+++ b/chrome/browser/ui/ash/app_list/test/app_list_service_ash_test_api.h
@@ -2,27 +2,27 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_TEST_APP_LIST_CONTROLLER_TEST_API_H_
-#define ASH_TEST_APP_LIST_CONTROLLER_TEST_API_H_
+#ifndef CHROME_BROWSER_UI_ASH_APP_LIST_TEST_APP_LIST_SERVICE_ASH_TEST_API_H_
+#define CHROME_BROWSER_UI_ASH_APP_LIST_TEST_APP_LIST_SERVICE_ASH_TEST_API_H_
 
 #include "base/macros.h"
 
 namespace app_list {
+class AppListShowerImpl;
 class AppListView;
 class AppsGridView;
 class StartPageView;
 }
 
-namespace ash {
-class AppListController;
-class Shell;
+// Accesses private data from an AppListServiceAsh and AppListShowerImpl
+// for testing.
+class AppListServiceAshTestApi {
+ public:
+  AppListServiceAshTestApi();
 
-namespace test {
+  app_list::AppListShowerImpl* GetAppListShower() const;
 
-// Accesses private data from an AppListController for testing.
-class AppListControllerTestApi {
- public:
-  explicit AppListControllerTestApi(Shell* shell);
+  app_list::AppListView* GetAppListView() const;
 
   // Gets the root level apps grid view.
   app_list::AppsGridView* GetRootGridView() const;
@@ -30,18 +30,11 @@ class AppListControllerTestApi {
   // Gets the start page view.
   app_list::StartPageView* GetStartPageView() const;
 
-  app_list::AppListView* view() const;
-
-  // Calls Layout() on the ContentsView.
+  // Calls Layout() on the app_list::ContentsView.
   void LayoutContentsView();
 
  private:
-  AppListController* app_list_controller_;  // Not owned.
-
-  DISALLOW_COPY_AND_ASSIGN(AppListControllerTestApi);
+  DISALLOW_COPY_AND_ASSIGN(AppListServiceAshTestApi);
 };
 
-}  // namespace test
-}  // namespace ash
-
-#endif  // ASH_TEST_APP_LIST_CONTROLLER_TEST_API_H_
+#endif  // CHROME_BROWSER_UI_ASH_APP_LIST_TEST_APP_LIST_SERVICE_ASH_TEST_API_H_