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

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

Issue 964563002: Replace SetAuthenticatedUsername with SetAuthenticatedAccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@priv
Patch Set: rebased Created 5 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
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
7 #include "chrome/browser/browser_process.h" 6 #include "chrome/browser/browser_process.h"
7 #include "chrome/browser/signin/account_tracker_service_factory.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"
11 #include "chrome/test/base/testing_profile.h" 11 #include "chrome/test/base/testing_profile.h"
12 12
13 #if defined(USE_ASH) 13 #if defined(USE_ASH)
14 #include "ash/shell.h" 14 #include "ash/shell.h"
15 #endif 15 #endif
16 16
17 #if defined(USE_AURA) 17 #if defined(USE_AURA)
(...skipping 11 matching lines...) Expand all
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 static KeyedService* BuildSigninManagerFake(content::BrowserContext* context) { 35 static KeyedService* BuildSigninManagerFake(content::BrowserContext* context) {
36 Profile* profile = static_cast<Profile*>(context); 36 Profile* profile = static_cast<Profile*>(context);
37 #if defined (OS_CHROMEOS) 37 #if defined (OS_CHROMEOS)
38 SigninManagerBase* signin = new SigninManagerBase( 38 SigninManagerBase* signin = new SigninManagerBase(
39 ChromeSigninClientFactory::GetInstance()->GetForProfile(profile)); 39 ChromeSigninClientFactory::GetInstance()->GetForProfile(profile),
40 AccountTrackerServiceFactory::GetInstance()->GetForProfile(profile));
40 signin->Initialize(NULL); 41 signin->Initialize(NULL);
41 return signin; 42 return signin;
42 #else 43 #else
43 FakeSigninManager* manager = new FakeSigninManager(profile); 44 FakeSigninManager* manager = new FakeSigninManager(profile);
44 manager->Initialize(g_browser_process->local_state()); 45 manager->Initialize(g_browser_process->local_state());
45 return manager; 46 return manager;
46 #endif 47 #endif
47 } 48 }
48 49
49 void ChromeRenderViewHostTestHarness::TearDown() { 50 void ChromeRenderViewHostTestHarness::TearDown() {
50 RenderViewHostTestHarness::TearDown(); 51 RenderViewHostTestHarness::TearDown();
51 #if defined(USE_ASH) 52 #if defined(USE_ASH)
52 ash::Shell::DeleteInstance(); 53 ash::Shell::DeleteInstance();
53 #endif 54 #endif
54 #if defined(USE_AURA) 55 #if defined(USE_AURA)
55 aura::Env::DeleteInstance(); 56 aura::Env::DeleteInstance();
56 #endif 57 #endif
57 } 58 }
58 59
59 content::BrowserContext* 60 content::BrowserContext*
60 ChromeRenderViewHostTestHarness::CreateBrowserContext() { 61 ChromeRenderViewHostTestHarness::CreateBrowserContext() {
61 TestingProfile::Builder builder; 62 TestingProfile::Builder builder;
62 builder.AddTestingFactory(SigninManagerFactory::GetInstance(), 63 builder.AddTestingFactory(SigninManagerFactory::GetInstance(),
63 BuildSigninManagerFake); 64 BuildSigninManagerFake);
64 return builder.Build().release(); 65 return builder.Build().release();
65 } 66 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698