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

Unified Diff: chrome/browser/chromeos/login/app_launch_signin_screen.cc

Issue 23449023: Add kiosk browser tests for network configuration. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix flakiness Created 7 years, 3 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/login/app_launch_signin_screen.cc
diff --git a/chrome/browser/chromeos/login/app_launch_signin_screen.cc b/chrome/browser/chromeos/login/app_launch_signin_screen.cc
index d567a1034cf5cf16d61625bb44e0e0b7fc72a91d..06f17a795d5d9874d7997eb0e4ac7c59fe15d22a 100644
--- a/chrome/browser/chromeos/login/app_launch_signin_screen.cc
+++ b/chrome/browser/chromeos/login/app_launch_signin_screen.cc
@@ -13,6 +13,8 @@
namespace chromeos {
+UserManager* AppLaunchSigninScreen::test_user_manager_ = NULL;
+
AppLaunchSigninScreen::AppLaunchSigninScreen(
OobeUI* oobe_ui, Delegate* delegate)
: oobe_ui_(oobe_ui),
@@ -30,7 +32,7 @@ void AppLaunchSigninScreen::Show() {
}
void AppLaunchSigninScreen::InitOwnerUserList() {
- UserManager* user_manager = UserManager::Get();
+ UserManager* user_manager = GetUserManager();
const std::string& owner_email = user_manager->GetOwnerEmail();
const UserList& all_users = user_manager->GetUsers();
@@ -46,6 +48,16 @@ void AppLaunchSigninScreen::InitOwnerUserList() {
}
}
+// static
+void AppLaunchSigninScreen::SetUserManagerForTesting(
+ UserManager* user_manager) {
+ test_user_manager_ = user_manager;
+}
+
+UserManager* AppLaunchSigninScreen::GetUserManager() {
+ return test_user_manager_ ? test_user_manager_ : UserManager::Get();
+}
+
void AppLaunchSigninScreen::CancelPasswordChangedFlow() {
NOTREACHED();
}
« no previous file with comments | « chrome/browser/chromeos/login/app_launch_signin_screen.h ('k') | chrome/browser/chromeos/login/kiosk_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698