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

Side by Side Diff: ash/test/aura_shell_test_base.cc

Issue 9033007: Rename the aura_shell namespace to ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "ash/test/aura_shell_test_base.h" 5 #include "ash/test/aura_shell_test_base.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/test/test_shell_delegate.h" 8 #include "ash/test/test_shell_delegate.h"
9 9
10 namespace aura_shell { 10 namespace ash {
11 namespace test { 11 namespace test {
12 12
13 AuraShellTestBase::AuraShellTestBase() { 13 AuraShellTestBase::AuraShellTestBase() {
14 } 14 }
15 15
16 AuraShellTestBase::~AuraShellTestBase() { 16 AuraShellTestBase::~AuraShellTestBase() {
17 } 17 }
18 18
19 void AuraShellTestBase::SetUp() { 19 void AuraShellTestBase::SetUp() {
20 aura::test::AuraTestBase::SetUp(); 20 aura::test::AuraTestBase::SetUp();
21 21
22 // Creates Shell and hook with Desktop. 22 // Creates Shell and hook with Desktop.
23 aura_shell::Shell::CreateInstance(new TestShellDelegate); 23 ash::Shell::CreateInstance(new TestShellDelegate);
24 } 24 }
25 25
26 void AuraShellTestBase::TearDown() { 26 void AuraShellTestBase::TearDown() {
27 // Flush the message loop to finish pending release tasks. 27 // Flush the message loop to finish pending release tasks.
28 RunAllPendingInMessageLoop(); 28 RunAllPendingInMessageLoop();
29 29
30 // Tear down the shell. 30 // Tear down the shell.
31 aura_shell::Shell::DeleteInstance(); 31 ash::Shell::DeleteInstance();
32 32
33 aura::test::AuraTestBase::TearDown(); 33 aura::test::AuraTestBase::TearDown();
34 } 34 }
35 35
36 } // namespace test 36 } // namespace test
37 } // namespace aura_shell 37 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698