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

Side by Side Diff: chrome/test/base/chrome_render_view_host_test_harness.cc

Issue 14197014: Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merged ToT Created 7 years, 6 months 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) 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/browser_process.h" 7 #include "chrome/browser/browser_process.h"
8 #include "chrome/browser/signin/fake_signin_manager.h" 8 #include "chrome/browser/signin/fake_signin_manager.h"
9 #include "chrome/browser/signin/signin_manager_factory.h" 9 #include "chrome/browser/signin/signin_manager_factory.h"
10 #include "chrome/test/base/testing_profile.h" 10 #include "chrome/test/base/testing_profile.h"
11 11
12 #if defined(USE_ASH) 12 #if defined(USE_ASH)
13 #include "ash/shell.h" 13 #include "ash/shell.h"
14 #endif 14 #endif
15 15
16 #if defined(USE_AURA) 16 #if defined(USE_AURA)
17 #include "ui/aura/env.h" 17 #include "ui/aura/env.h"
18 #include "ui/aura/root_window.h" 18 #include "ui/aura/root_window.h"
19 #endif 19 #endif
20 20
21 using content::RenderViewHostTester; 21 using content::RenderViewHostTester;
22 using content::RenderViewHostTestHarness; 22 using content::RenderViewHostTestHarness;
23 23
24 ChromeRenderViewHostTestHarness::ChromeRenderViewHostTestHarness() 24 ChromeRenderViewHostTestHarness::ChromeRenderViewHostTestHarness() {
25 : RenderViewHostTestHarness() {
26 } 25 }
27 26
28 ChromeRenderViewHostTestHarness::~ChromeRenderViewHostTestHarness() { 27 ChromeRenderViewHostTestHarness::~ChromeRenderViewHostTestHarness() {
29 } 28 }
30 29
31 TestingProfile* ChromeRenderViewHostTestHarness::profile() { 30 TestingProfile* ChromeRenderViewHostTestHarness::profile() {
32 return static_cast<TestingProfile*>(browser_context_.get()); 31 return static_cast<TestingProfile*>(browser_context_.get());
33 } 32 }
34 33
35 RenderViewHostTester* ChromeRenderViewHostTestHarness::rvh_tester() { 34 RenderViewHostTester* ChromeRenderViewHostTestHarness::rvh_tester() {
(...skipping 27 matching lines...) Expand all
63 62
64 void ChromeRenderViewHostTestHarness::TearDown() { 63 void ChromeRenderViewHostTestHarness::TearDown() {
65 RenderViewHostTestHarness::TearDown(); 64 RenderViewHostTestHarness::TearDown();
66 #if defined(USE_ASH) 65 #if defined(USE_ASH)
67 ash::Shell::DeleteInstance(); 66 ash::Shell::DeleteInstance();
68 #endif 67 #endif
69 #if defined(USE_AURA) 68 #if defined(USE_AURA)
70 aura::Env::DeleteInstance(); 69 aura::Env::DeleteInstance();
71 #endif 70 #endif
72 } 71 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698