Use mojo app list interfaces for mash and classic ash.

ui/app_list/presenter/app_list_presenter_impl_unittest.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 "ui/app_list/presenter/app_list_presenter_impl.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "ui/app_list/presenter/app_list_presenter_delegate_factory.h"
@@ skipping 56 matching lines @@
 
 // Test fake for AppListPresenterDelegateFactory, creates instances of
 // AppListPresenterDelegateTest.
 class AppListPresenterDelegateFactoryTest
     : public AppListPresenterDelegateFactory {
  public:
   explicit AppListPresenterDelegateFactoryTest(aura::Window* container)
       : container_(container) {}
   ~AppListPresenterDelegateFactoryTest() override {}
 
-  AppListPresenterDelegateTest* current_delegate() { return current_delegate_; }
-
   // AppListPresenterDelegateFactory:
   std::unique_ptr<AppListPresenterDelegate> GetDelegate(
-      AppListPresenter* presenter) override {
-    current_delegate_ =
-        new AppListPresenterDelegateTest(container_, &app_list_view_delegate_);
-    return base::WrapUnique(current_delegate_);
+      AppListPresenterImpl* presenter) override {
+    return base::MakeUnique<AppListPresenterDelegateTest>(
+        container_, &app_list_view_delegate_);
   }
 
  private:
   aura::Window* container_;
-  AppListPresenterDelegateTest* current_delegate_ = nullptr;
   test::AppListTestViewDelegate app_list_view_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListPresenterDelegateFactoryTest);
 };
 
 }  // namespace
 
 class AppListPresenterImplTest : public aura::test::AuraTestBase {
  public:
   AppListPresenterImplTest();
   ~AppListPresenterImplTest() override;
 
   AppListPresenterImpl* presenter() { return presenter_.get(); }
   aura::Window* container() { return container_.get(); }
   int64_t GetDisplayId() { return test_screen()->GetPrimaryDisplay().id(); }
 
   // Don't cache the return of this method - a new delegate is created every
   // time the app list is shown.
   AppListPresenterDelegateTest* delegate() {
-    return factory_->current_delegate();
+    return static_cast<AppListPresenterDelegateTest*>(
+        presenter_test_api_->presenter_delegate());
   }
 
   // aura::test::AuraTestBase:
   void SetUp() override;
   void TearDown() override;
 
  private:
-  std::unique_ptr<AppListPresenterDelegateFactoryTest> factory_;
   std::unique_ptr<AppListPresenterImpl> presenter_;
   std::unique_ptr<aura::Window> container_;
+  std::unique_ptr<test::AppListPresenterImplTestApi> presenter_test_api_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListPresenterImplTest);
 };
 
 AppListPresenterImplTest::AppListPresenterImplTest() {}
 
 AppListPresenterImplTest::~AppListPresenterImplTest() {}
 
 void AppListPresenterImplTest::SetUp() {
   AuraTestBase::SetUp();
   new wm::DefaultActivationClient(root_window());
   container_.reset(CreateNormalWindow(0, root_window(), nullptr));
-  factory_.reset(new AppListPresenterDelegateFactoryTest(container_.get()));
-  presenter_.reset(new AppListPresenterImpl(factory_.get()));
+  presenter_ = base::MakeUnique<AppListPresenterImpl>(
+      base::MakeUnique<AppListPresenterDelegateFactoryTest>(container_.get()));
+  presenter_test_api_ =
+      base::MakeUnique<test::AppListPresenterImplTestApi>(presenter());
 }
 
 void AppListPresenterImplTest::TearDown() {
   container_.reset();
   AuraTestBase::TearDown();
 }
 
 // Tests that app launcher is dismissed when focus moves to a window which is
 // not app list window's sibling and that appropriate delegate callbacks are
 // executed when the app launcher is shown and then when the app launcher is
@@ skipping 53 matching lines @@
   EXPECT_TRUE(delegate()->update_bounds_called());
 }
 
 // Tests that the app list is dismissed and the delegate is destroyed when the
 // app list's widget is destroyed.
 TEST_F(AppListPresenterImplTest, WidgetDestroyed) {
   presenter()->Show(GetDisplayId());
   EXPECT_TRUE(presenter()->GetTargetVisibility());
   presenter()->GetView()->GetWidget()->CloseNow();
   EXPECT_FALSE(presenter()->GetTargetVisibility());
-  test::AppListPresenterImplTestApi presenter_test_api(presenter());
-  EXPECT_FALSE(presenter_test_api.presenter_delegate());
+  EXPECT_FALSE(delegate());
 }
 
 }  // namespace app_list