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

Side by Side Diff: ui/aura/test/aura_mus_test_base.cc

Issue 2865443002: Install FakeContextFactory for AuraMusWmTestBase (Closed)
Patch Set: Add comments 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 unified diff | Download patch
« no previous file with comments | « ui/aura/test/aura_mus_test_base.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/aura/test/aura_mus_test_base.h" 5 #include "ui/aura/test/aura_mus_test_base.h"
6 6
7 namespace aura { 7 namespace aura {
8 namespace test { 8 namespace test {
9 9
10 AuraMusWmTestBase::AuraMusWmTestBase() {} 10 AuraMusWmTestBase::AuraMusWmTestBase() {}
11 11
12 AuraMusWmTestBase::~AuraMusWmTestBase() {} 12 AuraMusWmTestBase::~AuraMusWmTestBase() {}
13 13
14 void AuraMusWmTestBase::SetUp() { 14 void AuraMusWmTestBase::SetUp() {
15 // Run AuraTestBase::SetUp() first because it puts an InProcessContextFactory
16 // in env.
15 EnableMusWithTestWindowTree(); 17 EnableMusWithTestWindowTree();
16 AuraTestBase::SetUp(); 18 AuraTestBase::SetUp();
19
20 aura::Env* env = aura::Env::GetInstance();
21 DCHECK(env);
22 context_factory_to_restore_ = env->context_factory();
23 env->set_context_factory(&context_factory_);
24 }
25
26 void AuraMusWmTestBase::TearDown() {
27 aura::Env::GetInstance()->set_context_factory(context_factory_to_restore_);
28 AuraTestBase::TearDown();
17 } 29 }
18 30
19 AuraMusClientTestBase::AuraMusClientTestBase() {} 31 AuraMusClientTestBase::AuraMusClientTestBase() {}
20 32
21 AuraMusClientTestBase::~AuraMusClientTestBase() {} 33 AuraMusClientTestBase::~AuraMusClientTestBase() {}
22 34
23 void AuraMusClientTestBase::SetUp() { 35 void AuraMusClientTestBase::SetUp() {
36 // Run AuraTestBase::SetUp() first because it puts an InProcessContextFactory
37 // in env.
24 EnableMusWithTestWindowTree(); 38 EnableMusWithTestWindowTree();
25 set_window_manager_delegate(nullptr); 39 set_window_manager_delegate(nullptr);
26 AuraTestBase::SetUp(); 40 AuraTestBase::SetUp();
41
42 aura::Env* env = aura::Env::GetInstance();
43 DCHECK(env);
44 context_factory_to_restore_ = env->context_factory();
45 env->set_context_factory(&context_factory_);
46 }
47
48 void AuraMusClientTestBase::TearDown() {
49 aura::Env::GetInstance()->set_context_factory(context_factory_to_restore_);
50 AuraTestBase::TearDown();
27 } 51 }
28 52
29 } // namespace test 53 } // namespace test
30 } // namespace aura 54 } // namespace aura
OLDNEW
« 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