Use mojo app list interfaces for mash and classic ash.

ash/test/test_shell_delegate.cc

 // Copyright (c) 2012 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 "ash/test/test_shell_delegate.h"
 
 #include <limits>
 
-#include "ash/app_list/app_list_presenter_delegate.h"
-#include "ash/app_list/app_list_presenter_delegate_factory.h"
 #include "ash/common/default_accessibility_delegate.h"
 #include "ash/common/gpu_support_stub.h"
 #include "ash/common/palette_delegate.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/test/test_session_state_delegate.h"
 #include "ash/common/test/test_shelf_delegate.h"
 #include "ash/common/test/test_system_tray_delegate.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/test/test_keyboard_ui.h"
 #include "ash/test/test_wallpaper_delegate.h"
 #include "ash/wm/window_util.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
-#include "ui/app_list/presenter/app_list_presenter_impl.h"
-#include "ui/app_list/presenter/app_list_view_delegate_factory.h"
-#include "ui/app_list/test/app_list_test_view_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/image/image.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/common/system/tray/system_tray_notifier.h"
 #endif
 
 namespace ash {
 namespace test {
-namespace {
-
-class AppListViewDelegateFactoryImpl
-    : public app_list::AppListViewDelegateFactory {
- public:
-  AppListViewDelegateFactoryImpl() {}
-  ~AppListViewDelegateFactoryImpl() override {}
-
-  // app_list::AppListViewDelegateFactory:
-  app_list::AppListViewDelegate* GetDelegate() override {
-    if (!app_list_view_delegate_.get()) {
-      app_list_view_delegate_.reset(
-          new app_list::test::AppListTestViewDelegate);
-    }
-    return app_list_view_delegate_.get();
-  }
-
- private:
-  std::unique_ptr<app_list::AppListViewDelegate> app_list_view_delegate_;
-
-  DISALLOW_COPY_AND_ASSIGN(AppListViewDelegateFactoryImpl);
-};
-
-}  // namespace
 
 TestShellDelegate::TestShellDelegate()
     : num_exit_requests_(0),
       multi_profiles_enabled_(false),
       force_maximize_on_first_run_(false),
-      touchscreen_enabled_in_local_pref_(true),
-      app_list_presenter_delegate_factory_(new AppListPresenterDelegateFactory(
-          base::WrapUnique(new AppListViewDelegateFactoryImpl))) {}
+      touchscreen_enabled_in_local_pref_(true) {}
 
 TestShellDelegate::~TestShellDelegate() {}
 
 ::service_manager::Connector* TestShellDelegate::GetShellConnector() const {
   return nullptr;
 }
 
 bool TestShellDelegate::IsIncognitoAllowed() const {
   return true;
 }
@@ skipping 21 matching lines @@
 void TestShellDelegate::Exit() {
   num_exit_requests_++;
 }
 
 keyboard::KeyboardUI* TestShellDelegate::CreateKeyboardUI() {
   return new TestKeyboardUI;
 }
 
 void TestShellDelegate::OpenUrlFromArc(const GURL& url) {}
 
-app_list::AppListPresenter* TestShellDelegate::GetAppListPresenter() {
-  if (!app_list_presenter_) {
-    app_list_presenter_.reset(new app_list::AppListPresenterImpl(
-        app_list_presenter_delegate_factory_.get()));
-  }
-  return app_list_presenter_.get();
-}
-
 ShelfDelegate* TestShellDelegate::CreateShelfDelegate(ShelfModel* model) {
   return new TestShelfDelegate(model);
 }
 
 SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate() {
   return new TestSystemTrayDelegate;
 }
 
 std::unique_ptr<WallpaperDelegate>
 TestShellDelegate::CreateWallpaperDelegate() {
@@ skipping 38 matching lines @@
 void TestShellDelegate::SetTouchscreenEnabledInPrefs(bool enabled,
                                                      bool use_local_state) {
   if (use_local_state)
     touchscreen_enabled_in_local_pref_ = enabled;
 }
 
 void TestShellDelegate::UpdateTouchscreenStatusFromPrefs() {}
 
 }  // namespace test
 }  // namespace ash