| Index: chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
|
| index 6e83da8736a7907665e1aad347e0cca69aed558a..31c1c385a65929f1be3695d83455e84e268ffce3 100644
|
| --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
|
| +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
|
| @@ -29,7 +29,6 @@
|
| #include "chrome/browser/chromeos/file_manager/drive_test_util.h"
|
| #include "chrome/browser/chromeos/file_manager/path_util.h"
|
| #include "chrome/browser/chromeos/file_manager/volume_manager.h"
|
| -#include "chrome/browser/chromeos/login/users/user_manager.h"
|
| #include "chrome/browser/chromeos/profiles/profile_helper.h"
|
| #include "chrome/browser/drive/fake_drive_service.h"
|
| #include "chrome/browser/extensions/component_loader.h"
|
| @@ -41,6 +40,7 @@
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "chromeos/chromeos_switches.h"
|
| +#include "components/user_manager/user_manager.h"
|
| #include "content/public/browser/notification_service.h"
|
| #include "content/public/test/test_utils.h"
|
| #include "extensions/browser/api/test/test_api.h"
|
| @@ -1131,7 +1131,8 @@ class MultiProfileFileManagerBrowserTest : public FileManagerBrowserTestBase {
|
|
|
| // Adds a new user for testing to the current session.
|
| void AddUser(const TestAccountInfo& info, bool log_in) {
|
| - chromeos::UserManager* const user_manager = chromeos::UserManager::Get();
|
| + user_manager::UserManager* const user_manager =
|
| + user_manager::UserManager::Get();
|
| if (log_in)
|
| user_manager->UserLoggedIn(info.email, info.hash, false);
|
| user_manager->SaveUserDisplayName(info.email,
|
|
|