| Index: chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
|
| index 247b27e16cd251bceb9ba5531c2c5f72bd54112d..0464c0d15afeac71431db876eb4fcc041c36d617 100644
|
| --- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
|
| +++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
|
| @@ -19,7 +19,7 @@
|
| #include "chrome/browser/chromeos/login/ui/mock_login_display.h"
|
| #include "chrome/browser/chromeos/login/ui/mock_login_display_host.h"
|
| #include "chrome/browser/chromeos/login/users/mock_user_manager.h"
|
| -#include "chrome/browser/chromeos/login/users/user_manager.h"
|
| +#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
|
| #include "chrome/browser/chromeos/login/wizard_controller.h"
|
| #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
|
| #include "chrome/browser/chromeos/policy/device_local_account.h"
|
| @@ -43,6 +43,7 @@
|
| #include "components/policy/core/common/cloud/mock_cloud_policy_store.h"
|
| #include "components/policy/core/common/cloud/policy_builder.h"
|
| #include "components/user_manager/user.h"
|
| +#include "components/user_manager/user_manager.h"
|
| #include "components/user_manager/user_type.h"
|
| #include "content/public/test/mock_notification_observer.h"
|
| #include "content/public/test/test_utils.h"
|
| @@ -350,11 +351,12 @@ class ExistingUserControllerPublicSessionTest
|
| ExistingUserControllerTest::SetUpOnMainThread();
|
|
|
| // Wait for the public session user to be created.
|
| - if (!chromeos::UserManager::Get()->IsKnownUser(public_session_user_id_)) {
|
| + if (!user_manager::UserManager::Get()->IsKnownUser(
|
| + public_session_user_id_)) {
|
| content::WindowedNotificationObserver(
|
| chrome::NOTIFICATION_USER_LIST_CHANGED,
|
| - base::Bind(&chromeos::UserManager::IsKnownUser,
|
| - base::Unretained(chromeos::UserManager::Get()),
|
| + base::Bind(&user_manager::UserManager::IsKnownUser,
|
| + base::Unretained(user_manager::UserManager::Get()),
|
| public_session_user_id_)).Wait();
|
| }
|
|
|
|
|