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

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

Issue 636673002: Remove navigation from TestRenderViewHost (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes from self-review Created 6 years, 2 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
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/chrome_signin_client_factory.h" 8 #include "chrome/browser/signin/chrome_signin_client_factory.h"
9 #include "chrome/browser/signin/fake_signin_manager.h" 9 #include "chrome/browser/signin/fake_signin_manager.h"
10 #include "chrome/browser/signin/signin_manager_factory.h" 10 #include "chrome/browser/signin/signin_manager_factory.h"
(...skipping 14 matching lines...) Expand all
25 ChromeRenderViewHostTestHarness::ChromeRenderViewHostTestHarness() { 25 ChromeRenderViewHostTestHarness::ChromeRenderViewHostTestHarness() {
26 } 26 }
27 27
28 ChromeRenderViewHostTestHarness::~ChromeRenderViewHostTestHarness() { 28 ChromeRenderViewHostTestHarness::~ChromeRenderViewHostTestHarness() {
29 } 29 }
30 30
31 TestingProfile* ChromeRenderViewHostTestHarness::profile() { 31 TestingProfile* ChromeRenderViewHostTestHarness::profile() {
32 return static_cast<TestingProfile*>(browser_context()); 32 return static_cast<TestingProfile*>(browser_context());
33 } 33 }
34 34
35 RenderViewHostTester* ChromeRenderViewHostTestHarness::rvh_tester() {
36 return RenderViewHostTester::For(rvh());
37 }
38
39 static KeyedService* BuildSigninManagerFake(content::BrowserContext* context) { 35 static KeyedService* BuildSigninManagerFake(content::BrowserContext* context) {
40 Profile* profile = static_cast<Profile*>(context); 36 Profile* profile = static_cast<Profile*>(context);
41 #if defined (OS_CHROMEOS) 37 #if defined (OS_CHROMEOS)
42 SigninManagerBase* signin = new SigninManagerBase( 38 SigninManagerBase* signin = new SigninManagerBase(
43 ChromeSigninClientFactory::GetInstance()->GetForProfile(profile)); 39 ChromeSigninClientFactory::GetInstance()->GetForProfile(profile));
44 signin->Initialize(NULL); 40 signin->Initialize(NULL);
45 return signin; 41 return signin;
46 #else 42 #else
47 FakeSigninManager* manager = new FakeSigninManager(profile); 43 FakeSigninManager* manager = new FakeSigninManager(profile);
48 manager->Initialize(g_browser_process->local_state()); 44 manager->Initialize(g_browser_process->local_state());
(...skipping 11 matching lines...) Expand all
60 #endif 56 #endif
61 } 57 }
62 58
63 content::BrowserContext* 59 content::BrowserContext*
64 ChromeRenderViewHostTestHarness::CreateBrowserContext() { 60 ChromeRenderViewHostTestHarness::CreateBrowserContext() {
65 TestingProfile::Builder builder; 61 TestingProfile::Builder builder;
66 builder.AddTestingFactory(SigninManagerFactory::GetInstance(), 62 builder.AddTestingFactory(SigninManagerFactory::GetInstance(),
67 BuildSigninManagerFake); 63 BuildSigninManagerFake);
68 return builder.Build().release(); 64 return builder.Build().release();
69 } 65 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698