chrome/browser/chromeos/display/display_preferences_unittest.cc - Issue 718673002: New user type introduced. Combines regular and supervised features.

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/chromeos/display/display_preferences_unittest.cc

Issue 718673002: New user type introduced. Combines regular and supervised features. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Logical expression fixed. Created 6 years, 1 month 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/chromeos/accessibility/accessibility_manager.cc ('K') | « chrome/browser/chromeos/display/display_preferences.cc ('k') | chrome/browser/chromeos/first_run/drive_first_run_controller.cc » ('j') | chrome/browser/chromeos/first_run/drive_first_run_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/display/display_preferences_unittest.cc

diff --git a/chrome/browser/chromeos/display/display_preferences_unittest.cc b/chrome/browser/chromeos/display/display_preferences_unittest.cc

index 60e26864169d944dcd10b6cfff9f525fcbbb036f..0829dcbbac37e5e33c630358a062af1eb819f662 100644

--- a/chrome/browser/chromeos/display/display_preferences_unittest.cc

+++ b/chrome/browser/chromeos/display/display_preferences_unittest.cc

@@ -69,14 +69,14 @@ class DisplayPreferencesTest : public ash::test::AshTestBase {

void LoggedInAsUser() {

EXPECT_CALL(*mock_user_manager_, IsUserLoggedIn())

.WillRepeatedly(testing::Return(true));

- EXPECT_CALL(*mock_user_manager_, IsLoggedInAsRegularUser())

+ EXPECT_CALL(*mock_user_manager_, IsLoggedInAsUserWithGaiaAccount())

.WillRepeatedly(testing::Return(true));

}

void LoggedInAsGuest() {

EXPECT_CALL(*mock_user_manager_, IsUserLoggedIn())

.WillRepeatedly(testing::Return(true));

- EXPECT_CALL(*mock_user_manager_, IsLoggedInAsRegularUser())

+ EXPECT_CALL(*mock_user_manager_, IsLoggedInAsUserWithGaiaAccount())

.WillRepeatedly(testing::Return(false));

EXPECT_CALL(*mock_user_manager_, IsLoggedInAsSupervisedUser())

.WillRepeatedly(testing::Return(false));