| Index: chrome/browser/profiles/profile_manager_unittest.cc
|
| diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc
|
| index 681ce384e12b5d7f8f9cdac57285d57cdb7fbf58..b43a97363b23c3f25f859d99bcb731222b2bd5af 100644
|
| --- a/chrome/browser/profiles/profile_manager_unittest.cc
|
| +++ b/chrome/browser/profiles/profile_manager_unittest.cc
|
| @@ -46,11 +46,12 @@
|
|
|
| #if defined(OS_CHROMEOS)
|
| #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_test_user_manager.h"
|
| #include "chrome/browser/chromeos/settings/cros_settings.h"
|
| #include "chrome/browser/chromeos/settings/device_settings_service.h"
|
| #include "chromeos/chromeos_switches.h"
|
| #include "chromeos/login/user_names.h"
|
| +#include "components/user_manager/user_manager.h"
|
| #endif
|
|
|
| using base::ASCIIToUTF16;
|
| @@ -404,9 +405,10 @@ class ProfileManagerGuestTest : public ProfileManagerTest {
|
| cl->AppendSwitch(chromeos::switches::kGuestSession);
|
| cl->AppendSwitch(::switches::kIncognito);
|
|
|
| - chromeos::UserManager::Get()->UserLoggedIn(chromeos::login::kGuestUserName,
|
| - chromeos::login::kGuestUserName,
|
| - false);
|
| + user_manager::UserManager::Get()->UserLoggedIn(
|
| + chromeos::login::kGuestUserName,
|
| + chromeos::login::kGuestUserName,
|
| + false);
|
| #endif
|
| }
|
| };
|
|
|