Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(417)

Unified Diff: ui/app_list/presenter/app_list_presenter_impl_unittest.cc

Issue 2576913002: Use mojo app list interfaces for mash and classic ash. (Closed)
Patch Set: Add missing dep. Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/app_list/presenter/app_list_presenter_impl_unittest.cc
diff --git a/ui/app_list/presenter/app_list_presenter_impl_unittest.cc b/ui/app_list/presenter/app_list_presenter_impl_unittest.cc
index cd9941f9d862fa70d8233f0fba1939cdb2d0f144..990065473dfd9c5ed66813821432d270e9eb6ad4 100644
--- a/ui/app_list/presenter/app_list_presenter_impl_unittest.cc
+++ b/ui/app_list/presenter/app_list_presenter_impl_unittest.cc
@@ -78,7 +78,7 @@ class AppListPresenterDelegateFactoryTest
// AppListPresenterDelegateFactory:
std::unique_ptr<AppListPresenterDelegate> GetDelegate(
- AppListPresenter* presenter) override {
+ AppListPresenterImpl* presenter) override {
current_delegate_ =
new AppListPresenterDelegateTest(container_, &app_list_view_delegate_);
return base::WrapUnique(current_delegate_);
@@ -114,7 +114,6 @@ class AppListPresenterImplTest : public aura::test::AuraTestBase {
void TearDown() override;
private:
- std::unique_ptr<AppListPresenterDelegateFactoryTest> factory_;
std::unique_ptr<AppListPresenterImpl> presenter_;
std::unique_ptr<aura::Window> container_;
@@ -129,8 +128,8 @@ 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()));
}
void AppListPresenterImplTest::TearDown() {

Powered by Google App Engine
This is Rietveld 408576698