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

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

Issue 824683002: UserManager stack refactoring. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test fixed. Created 5 years, 10 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/kiosk_browsertest.cc
diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc
index 37a3ae7a4a48750eb4549d4bd0b5b1e54bfe756c..340dff96e29a28f4c6b2f6f62059198c7b587c94 100644
--- a/chrome/browser/chromeos/login/kiosk_browsertest.cc
+++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc
@@ -31,7 +31,7 @@
#include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
#include "chrome/browser/chromeos/login/ui/login_display_host.h"
#include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
#include "chrome/browser/chromeos/login/users/mock_user_manager.h"
#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
@@ -1952,15 +1952,14 @@ class KioskHiddenWebUITest : public KioskTest,
IN_PROC_BROWSER_TEST_F(KioskHiddenWebUITest, AutolaunchWarning) {
// Add a device owner.
- FakeUserManager* user_manager = new FakeUserManager();
+ FakeChromeUserManager* user_manager = new FakeChromeUserManager();
user_manager->AddUser(kTestOwnerEmail);
ScopedUserManagerEnabler enabler(user_manager);
// Set kiosk app to autolaunch.
EnableConsumerKioskMode();
- chromeos::WizardController::SkipPostLoginScreensForTesting();
- chromeos::WizardController* wizard_controller =
- chromeos::WizardController::default_controller();
+ WizardController::SkipPostLoginScreensForTesting();
+ WizardController* wizard_controller = WizardController::default_controller();
CHECK(wizard_controller);
// Start login screen after configuring auto launch app since the warning

Powered by Google App Engine
This is Rietveld 408576698