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

Unified Diff: chrome/browser/chromeos/system/tray_accessibility_browsertest.cc

Issue 2438063002: user_manager: Remove deps on session_manager (Closed)
Patch Set: fix nits in PS1 Created 4 years, 2 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
Index: chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
diff --git a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
index 792042bf28c8aca38a62fff5b3f988ff4561f739..258d969cf56efae82e915fe90020bb97b6d9e4af 100644
--- a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
+++ b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
@@ -35,6 +35,7 @@
#include "components/policy/core/common/policy_types.h"
#include "components/policy/policy_constants.h"
#include "components/prefs/pref_service.h"
+#include "components/session_manager/core/session_manager.h"
#include "components/user_manager/user_manager.h"
#include "content/public/test/test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -272,7 +273,7 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, LoginStatus) {
user_manager::UserManager::Get()->UserLoggedIn(
AccountId::FromUserEmail("owner@invalid.domain"), "owner@invalid.domain",
true);
- user_manager::UserManager::Get()->SessionStarted();
+ session_manager::SessionManager::Get()->SessionStarted();
EXPECT_EQ(ash::LoginStatus::USER, GetLoginStatus());
}
@@ -286,7 +287,7 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowTrayIcon) {
user_manager::UserManager::Get()->UserLoggedIn(
AccountId::FromUserEmail("owner@invalid.domain"), "owner@invalid.domain",
true);
- user_manager::UserManager::Get()->SessionStarted();
+ session_manager::SessionManager::Get()->SessionStarted();
// Confirms that the icon is invisible just after login.
EXPECT_FALSE(IsTrayIconVisible());
@@ -352,7 +353,7 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenu) {
user_manager::UserManager::Get()->UserLoggedIn(
AccountId::FromUserEmail("owner@invalid.domain"), "owner@invalid.domain",
true);
- user_manager::UserManager::Get()->SessionStarted();
+ session_manager::SessionManager::Get()->SessionStarted();
SetShowAccessibilityOptionsInSystemTrayMenu(false);
@@ -421,7 +422,7 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenuWithShowMenuOption) {
user_manager::UserManager::Get()->UserLoggedIn(
AccountId::FromUserEmail("owner@invalid.domain"), "owner@invalid.domain",
true);
- user_manager::UserManager::Get()->SessionStarted();
+ session_manager::SessionManager::Get()->SessionStarted();
SetShowAccessibilityOptionsInSystemTrayMenu(true);

Powered by Google App Engine
This is Rietveld 408576698