OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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" |
11 #include "ui/aura/env.h" | 11 #include "ui/aura/env.h" |
12 #include "ui/aura/root_window.h" | 12 #include "ui/aura/root_window.h" |
13 #endif | 13 #endif |
14 | 14 |
15 using content::RenderViewHostTester; | 15 using content::RenderViewHostTester; |
| 16 using content::RenderViewHostTestHarness; |
16 | 17 |
17 ChromeRenderViewHostTestHarness::ChromeRenderViewHostTestHarness() | 18 ChromeRenderViewHostTestHarness::ChromeRenderViewHostTestHarness() |
18 : RenderViewHostTestHarness() { | 19 : RenderViewHostTestHarness() { |
19 } | 20 } |
20 | 21 |
21 ChromeRenderViewHostTestHarness::~ChromeRenderViewHostTestHarness() { | 22 ChromeRenderViewHostTestHarness::~ChromeRenderViewHostTestHarness() { |
22 } | 23 } |
23 | 24 |
24 TestingProfile* ChromeRenderViewHostTestHarness::profile() { | 25 TestingProfile* ChromeRenderViewHostTestHarness::profile() { |
25 return static_cast<TestingProfile*>(browser_context_.get()); | 26 return static_cast<TestingProfile*>(browser_context_.get()); |
(...skipping 13 matching lines...) Expand all Loading... |
39 RenderViewHostTestHarness::SetUp(); | 40 RenderViewHostTestHarness::SetUp(); |
40 } | 41 } |
41 | 42 |
42 void ChromeRenderViewHostTestHarness::TearDown() { | 43 void ChromeRenderViewHostTestHarness::TearDown() { |
43 RenderViewHostTestHarness::TearDown(); | 44 RenderViewHostTestHarness::TearDown(); |
44 #if defined(USE_AURA) | 45 #if defined(USE_AURA) |
45 ash::Shell::DeleteInstance(); | 46 ash::Shell::DeleteInstance(); |
46 aura::Env::DeleteInstance(); | 47 aura::Env::DeleteInstance(); |
47 #endif | 48 #endif |
48 } | 49 } |
OLD | NEW |