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 "chrome/test/base/chrome_render_view_host_test_harness.h" | 5 #include "chrome/test/base/chrome_render_view_host_test_harness.h" |
6 | 6 |
7 #include "chrome/test/base/testing_profile.h" | 7 #include "chrome/test/base/testing_profile.h" |
8 | 8 |
9 #if defined(USE_AURA) | 9 #if defined(USE_AURA) |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
(...skipping 15 matching lines...) Expand all Loading... |
26 void ChromeRenderViewHostTestHarness::SetUp() { | 26 void ChromeRenderViewHostTestHarness::SetUp() { |
27 if (!browser_context_.get()) | 27 if (!browser_context_.get()) |
28 browser_context_.reset(new TestingProfile()); | 28 browser_context_.reset(new TestingProfile()); |
29 RenderViewHostTestHarness::SetUp(); | 29 RenderViewHostTestHarness::SetUp(); |
30 } | 30 } |
31 | 31 |
32 void ChromeRenderViewHostTestHarness::TearDown() { | 32 void ChromeRenderViewHostTestHarness::TearDown() { |
33 RenderViewHostTestHarness::TearDown(); | 33 RenderViewHostTestHarness::TearDown(); |
34 #if defined(USE_AURA) | 34 #if defined(USE_AURA) |
35 ash::Shell::DeleteInstance(); | 35 ash::Shell::DeleteInstance(); |
36 aura::RootWindow::DeleteInstance(); | |
37 aura::Env::DeleteInstance(); | 36 aura::Env::DeleteInstance(); |
38 #endif | 37 #endif |
39 } | 38 } |
OLD | NEW |