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

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

Issue 13871009: Move signin_manager_fake.* to fake_signin_manager.* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to TOT Created 7 years, 8 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/chrome_tests_unit.gypi ('k') | no next file » | 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) 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/signin_manager_factory.h" 8 #include "chrome/browser/signin/signin_manager_factory.h"
8 #include "chrome/browser/signin/signin_manager_fake.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
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 52
53 void ChromeRenderViewHostTestHarness::TearDown() { 53 void ChromeRenderViewHostTestHarness::TearDown() {
54 RenderViewHostTestHarness::TearDown(); 54 RenderViewHostTestHarness::TearDown();
55 #if defined(USE_ASH) 55 #if defined(USE_ASH)
56 ash::Shell::DeleteInstance(); 56 ash::Shell::DeleteInstance();
57 #endif 57 #endif
58 #if defined(USE_AURA) 58 #if defined(USE_AURA)
59 aura::Env::DeleteInstance(); 59 aura::Env::DeleteInstance();
60 #endif 60 #endif
61 } 61 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698