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

Unified Diff: chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc

Issue 2468483002: session_manager: Tracks user sessions (Closed)
Patch Set: fix compile on non-chromeos Created 4 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
Index: chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc b/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc
index 41d3a532c47ef5d94a44f36e554e64f0e968ace5..cc437a5294dfde53e8eecb94c62762f41de1c3cf 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc
+++ b/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc
@@ -29,7 +29,6 @@
#include "components/session_manager/core/session_manager.h"
#include "components/signin/core/account_id/account_id.h"
#include "components/sync_preferences/pref_service_syncable.h"
-#include "components/user_manager/user_manager.h"
#include "components/user_manager/user_names.h"
#include "content/public/browser/notification_service.h"
#include "content/public/test/test_utils.h"
@@ -297,8 +296,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest, Login) {
EXPECT_EQ(default_autoclick_delay(), GetAutoclickDelay());
// Logs in.
- user_manager::UserManager::Get()->UserLoggedIn(test_account_id_,
- kTestUserName, true);
+ session_manager::SessionManager::Get()->CreateSession(test_account_id_,
+ kTestUserName);
// Confirms that the features still disabled just after login.
EXPECT_FALSE(IsLargeCursorEnabled());
@@ -366,8 +365,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest, BrailleOnLoginScreen) {
IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest, TypePref) {
// Logs in.
- user_manager::UserManager::Get()->UserLoggedIn(test_account_id_,
- kTestUserName, true);
+ session_manager::SessionManager::Get()->CreateSession(test_account_id_,
achuithb 2016/10/31 21:55:56 Maybe: auto* session_manager = session_manager::Se
xiyuan 2016/10/31 22:29:45 Done.
+ kTestUserName);
session_manager::SessionManager::Get()->SessionStarted();
// Confirms that the features are disabled just after login.
@@ -435,8 +434,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest, TypePref) {
IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest, ResumeSavedPref) {
// Loads the profile of the user.
- user_manager::UserManager::Get()->UserLoggedIn(test_account_id_,
- kTestUserName, true);
+ session_manager::SessionManager::Get()->CreateSession(test_account_id_,
+ kTestUserName);
// Sets the pref to enable large cursor before login.
SetLargeCursorEnabledPref(true);
@@ -485,8 +484,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest,
MockAccessibilityObserver observer;
// Logs in.
- user_manager::UserManager::Get()->UserLoggedIn(test_account_id_,
- kTestUserName, true);
+ session_manager::SessionManager::Get()->CreateSession(test_account_id_,
+ kTestUserName);
session_manager::SessionManager::Get()->SessionStarted();
EXPECT_FALSE(observer.observed());
@@ -561,8 +560,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest,
MockAccessibilityObserver observer;
// Logs in.
- user_manager::UserManager::Get()->UserLoggedIn(test_account_id_,
- kTestUserName, true);
+ session_manager::SessionManager::Get()->CreateSession(test_account_id_,
+ kTestUserName);
session_manager::SessionManager::Get()->SessionStarted();
EXPECT_FALSE(observer.observed());
@@ -673,8 +672,8 @@ IN_PROC_BROWSER_TEST_P(AccessibilityManagerUserTypeTest,
// Logs in.
const AccountId account_id = AccountId::FromUserEmail(GetParam());
- user_manager::UserManager::Get()->UserLoggedIn(
- account_id, account_id.GetUserEmail(), true);
+ session_manager::SessionManager::Get()->CreateSession(
+ account_id, account_id.GetUserEmail());
// Confirms that the features are still enabled just after login.
EXPECT_TRUE(IsLargeCursorEnabled());
@@ -706,8 +705,8 @@ IN_PROC_BROWSER_TEST_P(AccessibilityManagerUserTypeTest,
IN_PROC_BROWSER_TEST_P(AccessibilityManagerUserTypeTest, BrailleWhenLoggedIn) {
// Logs in.
const AccountId account_id = AccountId::FromUserEmail(GetParam());
- user_manager::UserManager::Get()->UserLoggedIn(
- account_id, account_id.GetUserEmail(), true);
+ session_manager::SessionManager::Get()->CreateSession(
+ account_id, account_id.GetUserEmail());
session_manager::SessionManager::Get()->SessionStarted();
// This object watches for IME preference changes and reflects those in
// the IME framework state.
@@ -752,8 +751,8 @@ IN_PROC_BROWSER_TEST_P(AccessibilityManagerUserTypeTest, BrailleWhenLoggedIn) {
IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest, AccessibilityMenuVisibility) {
// Log in.
- user_manager::UserManager::Get()->UserLoggedIn(test_account_id_,
- kTestUserName, true);
+ session_manager::SessionManager::Get()->CreateSession(test_account_id_,
+ kTestUserName);
session_manager::SessionManager::Get()->SessionStarted();
// Confirms that the features are disabled.

Powered by Google App Engine
This is Rietveld 408576698