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) |
| 10 #include "ui/aura/root_window.h" |
| 11 #include "ui/aura_shell/shell.h" |
| 12 #endif |
| 13 |
9 ChromeRenderViewHostTestHarness::ChromeRenderViewHostTestHarness() | 14 ChromeRenderViewHostTestHarness::ChromeRenderViewHostTestHarness() |
10 : RenderViewHostTestHarness() { | 15 : RenderViewHostTestHarness() { |
11 } | 16 } |
12 | 17 |
13 ChromeRenderViewHostTestHarness::~ChromeRenderViewHostTestHarness() { | 18 ChromeRenderViewHostTestHarness::~ChromeRenderViewHostTestHarness() { |
14 } | 19 } |
15 | 20 |
16 TestingProfile* ChromeRenderViewHostTestHarness::profile() { | 21 TestingProfile* ChromeRenderViewHostTestHarness::profile() { |
17 return static_cast<TestingProfile*>(browser_context_.get()); | 22 return static_cast<TestingProfile*>(browser_context_.get()); |
18 } | 23 } |
19 | 24 |
20 void ChromeRenderViewHostTestHarness::SetUp() { | 25 void ChromeRenderViewHostTestHarness::SetUp() { |
21 if (!browser_context_.get()) | 26 if (!browser_context_.get()) |
22 browser_context_.reset(new TestingProfile()); | 27 browser_context_.reset(new TestingProfile()); |
23 RenderViewHostTestHarness::SetUp(); | 28 RenderViewHostTestHarness::SetUp(); |
24 } | 29 } |
25 | 30 |
26 void ChromeRenderViewHostTestHarness::TearDown() { | 31 void ChromeRenderViewHostTestHarness::TearDown() { |
27 RenderViewHostTestHarness::TearDown(); | 32 RenderViewHostTestHarness::TearDown(); |
| 33 #if defined(USE_AURA) |
| 34 aura_shell::Shell::DeleteInstance(); |
| 35 aura::RootWindow::DeleteInstance(); |
| 36 #endif |
28 } | 37 } |
OLD | NEW |