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

Unified Diff: ui/aura/test/aura_mus_test_base.cc

Issue 2865443002: Install FakeContextFactory for AuraMusWmTestBase (Closed)
Patch Set: Created 3 years, 7 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 | « ui/aura/test/aura_mus_test_base.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/test/aura_mus_test_base.cc
diff --git a/ui/aura/test/aura_mus_test_base.cc b/ui/aura/test/aura_mus_test_base.cc
index e89b1eb458428c6b4da8e02f7305ed08309058c9..8cd4a8f03c0e531c76b1513c74712d4b2c436372 100644
--- a/ui/aura/test/aura_mus_test_base.cc
+++ b/ui/aura/test/aura_mus_test_base.cc
@@ -14,6 +14,16 @@ AuraMusWmTestBase::~AuraMusWmTestBase() {}
void AuraMusWmTestBase::SetUp() {
EnableMusWithTestWindowTree();
AuraTestBase::SetUp();
+
+ aura::Env* env = aura::Env::GetInstance();
+ DCHECK(env);
+ context_factory_to_restore_ = env->context_factory();
+ env->set_context_factory(&context_factory_);
sadrul 2017/05/04 17:50:46 I think you want to do this first, before seeing u
Alex Z. 2017/05/04 18:01:16 AuraTestBase::SetUp() create an InProcessContextFa
Alex Z. 2017/05/05 13:34:44 I added a comment explaining this here.
+}
+
+void AuraMusWmTestBase::TearDown() {
+ aura::Env::GetInstance()->set_context_factory(context_factory_to_restore_);
+ AuraTestBase::TearDown();
}
AuraMusClientTestBase::AuraMusClientTestBase() {}
« no previous file with comments | « ui/aura/test/aura_mus_test_base.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698