| 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/browser/signin/fake_signin_manager.h" | 7 #include "chrome/browser/signin/fake_signin_manager.h" |
| 8 #include "chrome/browser/signin/signin_manager_factory.h" | 8 #include "chrome/browser/signin/signin_manager_factory.h" |
| 9 #include "chrome/test/base/testing_profile.h" | 9 #include "chrome/test/base/testing_profile.h" |
| 10 | 10 |
| 11 #if defined(USE_ASH) | 11 #if defined(USE_ASH) |
| 12 #include "ash/shell.h" | 12 #include "ash/shell.h" |
| 13 #endif | 13 #endif |
| 14 | 14 |
| 15 #if defined(USE_AURA) | 15 #if defined(USE_AURA) |
| 16 #include "ui/aura/env.h" | 16 #include "ui/aura/env.h" |
| 17 #include "ui/aura/root_window.h" | 17 #include "ui/aura/root_window.h" |
| 18 #endif | 18 #endif |
| 19 | 19 |
| 20 using content::RenderViewHostTester; | 20 using content::RenderViewHostTester; |
| 21 using content::RenderViewHostTestHarness; | 21 using content::RenderViewHostTestHarness; |
| 22 | 22 |
| 23 ChromeRenderViewHostTestHarness::ChromeRenderViewHostTestHarness() | 23 ChromeRenderViewHostTestHarness::ChromeRenderViewHostTestHarness() { |
| 24 : RenderViewHostTestHarness() { | |
| 25 } | 24 } |
| 26 | 25 |
| 27 ChromeRenderViewHostTestHarness::~ChromeRenderViewHostTestHarness() { | 26 ChromeRenderViewHostTestHarness::~ChromeRenderViewHostTestHarness() { |
| 28 } | 27 } |
| 29 | 28 |
| 30 TestingProfile* ChromeRenderViewHostTestHarness::profile() { | 29 TestingProfile* ChromeRenderViewHostTestHarness::profile() { |
| 31 return static_cast<TestingProfile*>(browser_context_.get()); | 30 return static_cast<TestingProfile*>(browser_context_.get()); |
| 32 } | 31 } |
| 33 | 32 |
| 34 RenderViewHostTester* ChromeRenderViewHostTestHarness::rvh_tester() { | 33 RenderViewHostTester* ChromeRenderViewHostTestHarness::rvh_tester() { |
| (...skipping 27 matching lines...) Expand all Loading... |
| 62 | 61 |
| 63 void ChromeRenderViewHostTestHarness::TearDown() { | 62 void ChromeRenderViewHostTestHarness::TearDown() { |
| 64 RenderViewHostTestHarness::TearDown(); | 63 RenderViewHostTestHarness::TearDown(); |
| 65 #if defined(USE_ASH) | 64 #if defined(USE_ASH) |
| 66 ash::Shell::DeleteInstance(); | 65 ash::Shell::DeleteInstance(); |
| 67 #endif | 66 #endif |
| 68 #if defined(USE_AURA) | 67 #if defined(USE_AURA) |
| 69 aura::Env::DeleteInstance(); | 68 aura::Env::DeleteInstance(); |
| 70 #endif | 69 #endif |
| 71 } | 70 } |
| OLD | NEW |