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

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

Issue 9535025: Remove the singleton instance get/delete methods from RootWindow (yay) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
« no previous file with comments | « chrome/test/base/browser_with_test_window_test.cc ('k') | chrome/test/base/ui_test_utils.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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) 9 #if defined(USE_AURA)
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 15 matching lines...) Expand all
26 void ChromeRenderViewHostTestHarness::SetUp() { 26 void ChromeRenderViewHostTestHarness::SetUp() {
27 if (!browser_context_.get()) 27 if (!browser_context_.get())
28 browser_context_.reset(new TestingProfile()); 28 browser_context_.reset(new TestingProfile());
29 RenderViewHostTestHarness::SetUp(); 29 RenderViewHostTestHarness::SetUp();
30 } 30 }
31 31
32 void ChromeRenderViewHostTestHarness::TearDown() { 32 void ChromeRenderViewHostTestHarness::TearDown() {
33 RenderViewHostTestHarness::TearDown(); 33 RenderViewHostTestHarness::TearDown();
34 #if defined(USE_AURA) 34 #if defined(USE_AURA)
35 ash::Shell::DeleteInstance(); 35 ash::Shell::DeleteInstance();
36 aura::RootWindow::DeleteInstance();
37 aura::Env::DeleteInstance(); 36 aura::Env::DeleteInstance();
38 #endif 37 #endif
39 } 38 }
OLDNEW
« no previous file with comments | « chrome/test/base/browser_with_test_window_test.cc ('k') | chrome/test/base/ui_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698