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

Unified Diff: components/exo/test/exo_test_base.cc

Issue 2250863003: exo: Run exo in mus+ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build errors Created 4 years, 4 months 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
« no previous file with comments | « components/exo/test/exo_test_base.h ('k') | components/exo/wm_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/exo/test/exo_test_base.cc
diff --git a/components/exo/test/exo_test_base.cc b/components/exo/test/exo_test_base.cc
index 738320d7e6dfe7e90476ce3b12d5e5f734ee5193..c6e4d4790cca12edb68d9cce66bb9226337e9598 100644
--- a/components/exo/test/exo_test_base.cc
+++ b/components/exo/test/exo_test_base.cc
@@ -5,7 +5,9 @@
#include "components/exo/test/exo_test_base.h"
#include "base/command_line.h"
+#include "base/memory/ptr_util.h"
#include "components/exo/test/exo_test_helper.h"
+#include "components/exo/wm_helper_ash.h"
#include "ui/wm/core/wm_core_switches.h"
namespace exo {
@@ -23,9 +25,13 @@ void ExoTestBase::SetUp() {
// Disable window animation when running tests.
command_line->AppendSwitch(wm::switches::kWindowAnimationsDisabled);
AshTestBase::SetUp();
+ wm_helper_ = base::MakeUnique<WMHelperAsh>();
+ WMHelper::SetInstance(wm_helper_.get());
}
void ExoTestBase::TearDown() {
+ WMHelper::SetInstance(nullptr);
+ wm_helper_.reset();
AshTestBase::TearDown();
}
« no previous file with comments | « components/exo/test/exo_test_base.h ('k') | components/exo/wm_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698