OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_shell/test/aura_shell_test_base.h" | 5 #include "ui/aura_shell/test/aura_shell_test_base.h" |
6 | 6 |
7 #include "ui/aura_shell/shell.h" | 7 #include "ui/aura_shell/shell.h" |
8 | 8 |
9 namespace aura_shell { | 9 namespace aura_shell { |
10 namespace test { | 10 namespace test { |
11 | 11 |
12 AuraShellTestBase::AuraShellTestBase() { | 12 AuraShellTestBase::AuraShellTestBase() { |
13 } | 13 } |
14 | 14 |
15 AuraShellTestBase::~AuraShellTestBase() { | 15 AuraShellTestBase::~AuraShellTestBase() { |
16 } | 16 } |
17 | 17 |
18 void AuraShellTestBase::SetUp() { | 18 void AuraShellTestBase::SetUp() { |
19 aura::test::AuraTestBase::SetUp(); | 19 aura::test::AuraTestBase::SetUp(); |
20 | 20 |
21 // Creates Shell and hook with Desktop. | 21 // Creates Shell and hook with Desktop. |
22 aura_shell::Shell::CreateInstance(NULL); | 22 aura_shell::Shell::CreateInstance(NULL); |
23 } | 23 } |
24 | 24 |
25 void AuraShellTestBase::TearDown() { | 25 void AuraShellTestBase::TearDown() { |
26 // Flush the message loop to finish pending release tasks. | 26 // Flush the message loop to finish pending release tasks. |
27 RunAllPendingInMessageLoop(); | 27 RunAllPendingInMessageLoop(); |
28 | 28 |
29 // Tear down the shell. | 29 // Tear down the shell. |
30 aura_shell::Shell::DeleteInstanceForTesting(); | 30 aura_shell::Shell::DeleteInstance(); |
31 | 31 |
32 aura::test::AuraTestBase::TearDown(); | 32 aura::test::AuraTestBase::TearDown(); |
33 } | 33 } |
34 | 34 |
35 } // namespace test | 35 } // namespace test |
36 } // namespace aura_shell | 36 } // namespace aura_shell |
OLD | NEW |