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

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

Unified Diff: chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc

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

Patch Set: rebase 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc ('K') | « chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc ('k') | chrome/browser/ui/webui/options/chromeos/user_image_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc b/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc

index 4cd5c94ea125e96d022d751c2cd5fedb85880c31..4655807aaedd3d4e13ea32e45d6177546ddcc078 100644

--- a/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc

+++ b/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc

@@ -271,7 +271,7 @@ IN_PROC_BROWSER_TEST_F(SharedOptionsTest, SharedOptions) {

content::RunAllPendingInMessageLoop();

AddUser(kTestNonOwner);

- UserManager* manager = UserManager::Get();

+ UserManager* manager = GetUserManager();

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

{

SCOPED_TRACE("Checking settings for owner, primary user.");

@@ -302,7 +302,7 @@ IN_PROC_BROWSER_TEST_F(SharedOptionsTest, ScreenLockPreferencePrimary) {

content::RunAllPendingInMessageLoop();

AddUser(kTestNonOwner);

- UserManager* manager = UserManager::Get();

+ UserManager* manager = GetUserManager();

const User* user1 = manager->FindUser(kTestOwner);

const User* user2 = manager->FindUser(kTestNonOwner);

@@ -373,7 +373,7 @@ IN_PROC_BROWSER_TEST_F(SharedOptionsTest, ScreenLockPreferenceSecondary) {

content::RunAllPendingInMessageLoop();

AddUser(kTestNonOwner);

- UserManager* manager = UserManager::Get();

+ UserManager* manager = GetUserManager();

const User* user1 = manager->FindUser(kTestOwner);

const User* user2 = manager->FindUser(kTestNonOwner);