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

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

Issue 9838009: Clean up a few TODO items. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Respond to review comments. Created 8 years, 9 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/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
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 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698