chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc - Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager().

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc

Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix test Created 6 years, 5 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/browser/ui/webui/options/browser_options_handler.cc ('k') | chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 "base/basictypes.h"	5 #include "base/basictypes.h"

6 #include "base/compiler_specific.h"	6 #include "base/compiler_specific.h"

7 #include "base/prefs/pref_service.h"	7 #include "base/prefs/pref_service.h"

8 #include "chrome/browser/chromeos/login/login_manager_test.h"	8 #include "chrome/browser/chromeos/login/login_manager_test.h"

9 #include "chrome/browser/chromeos/login/startup_utils.h"	9 #include "chrome/browser/chromeos/login/startup_utils.h"

10 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"	10 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"

(...skipping 118 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
129 RegisterUser(kTestUsers[1]);	129 RegisterUser(kTestUsers[1]);

130 StartupUtils::MarkOobeCompleted();	130 StartupUtils::MarkOobeCompleted();

131 }	131 }

132	132

133 IN_PROC_BROWSER_TEST_F(AccountsOptionsTest, MultiProfilesAccountsOptions) {	133 IN_PROC_BROWSER_TEST_F(AccountsOptionsTest, MultiProfilesAccountsOptions) {

134 LoginUser(kTestUsers[0]);	134 LoginUser(kTestUsers[0]);

135 UserAddingScreen::Get()->Start();	135 UserAddingScreen::Get()->Start();

136 content::RunAllPendingInMessageLoop();	136 content::RunAllPendingInMessageLoop();

137 AddUser(kTestUsers[1]);	137 AddUser(kTestUsers[1]);

138	138

139 UserManager* manager = UserManager::Get();	139 UserManager* manager = GetUserManager();

140 ASSERT_EQ(2u, manager->GetLoggedInUsers().size());	140 ASSERT_EQ(2u, manager->GetLoggedInUsers().size());

141	141

142 CheckAccountsUI(manager->FindUser(kTestUsers[0]), true /* is_owner */);	142 CheckAccountsUI(manager->FindUser(kTestUsers[0]), true /* is_owner */);

143 CheckAccountsUI(manager->FindUser(kTestUsers[1]), false /* is_owner */);	143 CheckAccountsUI(manager->FindUser(kTestUsers[1]), false /* is_owner */);

144 }	144 }

145	145

146 } // namespace chromeos	146 } // namespace chromeos

OLD	NEW