Use mojo app list interfaces for mash and classic ash.

ash/app_list/app_list_presenter_delegate_unittest.cc

Index: ash/app_list/app_list_presenter_delegate_unittest.cc
diff --git a/ash/app_list/app_list_presenter_delegate_unittest.cc b/ash/app_list/app_list_presenter_delegate_unittest.cc
index 106b83b0574c6b407f183a7fe29cb5904330fa49..3444cdd92d6b990acc2391ae9f9f6de1270d9a06 100644
--- a/ash/app_list/app_list_presenter_delegate_unittest.cc
+++ b/ash/app_list/app_list_presenter_delegate_unittest.cc
@@ -9,67 +9,57 @@
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
-#include "ash/test/ash_test_helper.h"
-#include "ash/test/test_shell_delegate.h"
+#include "ash/test/test_app_list_presenter_impl.h"
 #include "ash/wm/window_util.h"
-#include "base/command_line.h"
-#include "ui/app_list/app_list_switches.h"
-#include "ui/app_list/presenter/app_list_presenter_impl.h"
+#include "base/macros.h"
 #include "ui/app_list/views/app_list_view.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
+#include "ui/display/manager/display_manager.h"
 #include "ui/events/test/event_generator.h"
 
 namespace ash {
 
-namespace {
-const int kMinimalAppListMargin = 10;
-}
-
 class AppListPresenterDelegateTest : public test::AshTestBase {
  public:
-  AppListPresenterDelegateTest();
-  ~AppListPresenterDelegateTest() override;
-
-  // testing::Test:
-  void SetUp() override;
-
-  app_list::AppListPresenterImpl* GetAppListPresenter();
-};
+  AppListPresenterDelegateTest() {}
+  ~AppListPresenterDelegateTest() override {}
 
-AppListPresenterDelegateTest::AppListPresenterDelegateTest() {}
+  app_list::AppListPresenterImpl* app_list_presenter_impl() {
+    return &app_list_presenter_impl_;
+  }
 
-AppListPresenterDelegateTest::~AppListPresenterDelegateTest() {}
+  // testing::Test:
+  void SetUp() override {
+    AshTestBase::SetUp();
 
-void AppListPresenterDelegateTest::SetUp() {
-  AshTestBase::SetUp();
+    // Make the display big enough to hold the app list.
+    UpdateDisplay("1024x768");
+  }
 
-  // Make the display big enough to hold the app list.
-  UpdateDisplay("1024x768");
-}
+ private:
+  test::TestAppListPresenterImpl app_list_presenter_impl_;
 
-app_list::AppListPresenterImpl*
-AppListPresenterDelegateTest::GetAppListPresenter() {
-  return ash_test_helper()->test_shell_delegate()->app_list_presenter();
-}
+  DISALLOW_COPY_AND_ASSIGN(AppListPresenterDelegateTest);
+};
 
 // Tests that app launcher hides when focus moves to a normal window.
 TEST_F(AppListPresenterDelegateTest, HideOnFocusOut) {
-  WmShell::Get()->ShowAppList();
-  EXPECT_TRUE(WmShell::Get()->GetAppListTargetVisibility());
+  app_list_presenter_impl()->Show(display_manager()->first_display_id());
+  EXPECT_TRUE(app_list_presenter_impl()->GetTargetVisibility());
 
   std::unique_ptr<aura::Window> window(CreateTestWindowInShellWithId(0));
   wm::ActivateWindow(window.get());
 
-  EXPECT_FALSE(WmShell::Get()->GetAppListTargetVisibility());
+  EXPECT_FALSE(app_list_presenter_impl()->GetTargetVisibility());
 }
 
 // Tests that app launcher remains visible when focus is moved to a different
 // window in kShellWindowId_AppListContainer.
 TEST_F(AppListPresenterDelegateTest,
        RemainVisibleWhenFocusingToApplistContainer) {
-  WmShell::Get()->ShowAppList();
-  EXPECT_TRUE(WmShell::Get()->GetAppListTargetVisibility());
+  app_list_presenter_impl()->Show(display_manager()->first_display_id());
+  EXPECT_TRUE(app_list_presenter_impl()->GetTargetVisibility());
 
   aura::Window* applist_container = Shell::GetContainer(
       Shell::GetPrimaryRootWindow(), kShellWindowId_AppListContainer);
@@ -77,19 +67,19 @@ TEST_F(AppListPresenterDelegateTest,
       aura::test::CreateTestWindowWithId(0, applist_container));
   wm::ActivateWindow(window.get());
 
-  EXPECT_TRUE(WmShell::Get()->GetAppListTargetVisibility());
+  EXPECT_TRUE(app_list_presenter_impl()->GetTargetVisibility());
 }
 
 // Tests that clicking outside the app-list bubble closes it.
 TEST_F(AppListPresenterDelegateTest, ClickOutsideBubbleClosesBubble) {
-  WmShell::Get()->ShowAppList();
-  aura::Window* app_window = GetAppListPresenter()->GetWindow();
+  app_list_presenter_impl()->Show(display_manager()->first_display_id());
+  aura::Window* app_window = app_list_presenter_impl()->GetWindow();
   ASSERT_TRUE(app_window);
   ui::test::EventGenerator& generator = GetEventGenerator();
   // Click on the bubble itself. The bubble should remain visible.
   generator.MoveMouseToCenterOf(app_window);
   generator.ClickLeftButton();
-  EXPECT_TRUE(WmShell::Get()->GetAppListTargetVisibility());
+  EXPECT_TRUE(app_list_presenter_impl()->GetTargetVisibility());
 
   // Click outside the bubble. This should close it.
   gfx::Rect app_window_bounds = app_window->GetBoundsInRootWindow();
@@ -98,28 +88,28 @@ TEST_F(AppListPresenterDelegateTest, ClickOutsideBubbleClosesBubble) {
       gfx::Vector2d(10, 0);
   generator.MoveMouseToInHost(point_outside);
   generator.ClickLeftButton();
-  EXPECT_FALSE(WmShell::Get()->GetAppListTargetVisibility());
+  EXPECT_FALSE(app_list_presenter_impl()->GetTargetVisibility());
 }
 
 // Tests that clicking outside the app-list bubble closes it.
 TEST_F(AppListPresenterDelegateTest, TapOutsideBubbleClosesBubble) {
-  WmShell::Get()->ShowAppList();
+  app_list_presenter_impl()->Show(display_manager()->first_display_id());
 
-  aura::Window* app_window = GetAppListPresenter()->GetWindow();
+  aura::Window* app_window = app_list_presenter_impl()->GetWindow();
   ASSERT_TRUE(app_window);
   gfx::Rect app_window_bounds = app_window->GetBoundsInRootWindow();
 
   ui::test::EventGenerator& generator = GetEventGenerator();
   // Click on the bubble itself. The bubble should remain visible.
   generator.GestureTapAt(app_window_bounds.CenterPoint());
-  EXPECT_TRUE(WmShell::Get()->GetAppListTargetVisibility());
+  EXPECT_TRUE(app_list_presenter_impl()->GetTargetVisibility());
 
   // Click outside the bubble. This should close it.
   gfx::Point point_outside =
       gfx::Point(app_window_bounds.right(), app_window_bounds.y()) +
       gfx::Vector2d(10, 0);
   generator.GestureTapAt(point_outside);
-  EXPECT_FALSE(WmShell::Get()->GetAppListTargetVisibility());
+  EXPECT_FALSE(app_list_presenter_impl()->GetTargetVisibility());
 }
 
 // Tests opening the app launcher on a non-primary display, then deleting the
@@ -136,15 +126,15 @@ TEST_F(AppListPresenterDelegateTest, NonPrimaryDisplay) {
   WmWindow* secondary_root = root_windows[1];
   EXPECT_EQ("1024,0 1024x768", secondary_root->GetBoundsInScreen().ToString());
 
-  WmShell::Get()->delegate()->GetAppListPresenter()->Show(
+  app_list_presenter_impl()->Show(
       secondary_root->GetDisplayNearestWindow().id());
-  EXPECT_TRUE(WmShell::Get()->GetAppListTargetVisibility());
+  EXPECT_TRUE(app_list_presenter_impl()->GetTargetVisibility());
 
   // Remove the secondary display. Shouldn't crash (http://crbug.com/368990).
   UpdateDisplay("1024x768");
 
   // Updating the displays should close the app list.
-  EXPECT_FALSE(WmShell::Get()->GetAppListTargetVisibility());
+  EXPECT_FALSE(app_list_presenter_impl()->GetTargetVisibility());
 }
 
 // Tests opening the app launcher on a tiny display that is too small to contain
@@ -153,17 +143,18 @@ TEST_F(AppListPresenterDelegateTest, TinyDisplay) {
   // Set up a screen with a tiny display (height smaller than the app list).
   UpdateDisplay("400x300");
 
-  WmShell::Get()->ShowAppList();
-  EXPECT_TRUE(WmShell::Get()->GetAppListTargetVisibility());
+  app_list_presenter_impl()->Show(display_manager()->first_display_id());
+  EXPECT_TRUE(app_list_presenter_impl()->GetTargetVisibility());
 
   // The top of the app list should be on-screen (even if the bottom is not).
   // We need to manually calculate the Y coordinate of the top of the app list
   // from the anchor (center) and height. There isn't a bounds rect that gives
   // the actual app list position (the widget bounds include the bubble border
   // which is much bigger than the actual app list size).
-  app_list::AppListView* app_list = GetAppListPresenter()->GetView();
+  app_list::AppListView* app_list = app_list_presenter_impl()->GetView();
   int app_list_view_top =
       app_list->anchor_rect().y() - app_list->bounds().height() / 2;
+  const int kMinimalAppListMargin = 10;
   EXPECT_GE(app_list_view_top, kMinimalAppListMargin);
 }