Chromium Code Reviews| 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 e8efbfedfef1954cbf12f3688d706fc5917016ac..8e6588b8b7ea8a379602d14f2f34f18cb1349001 100644 |
| --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc |
| +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc |
| @@ -36,11 +36,13 @@ |
| #include "chrome/browser/notifications/notification.h" |
| #include "chrome/browser/notifications/notification_ui_manager.h" |
| #include "chrome/browser/profiles/profile.h" |
| +#include "chrome/browser/signin/signin_manager_factory.h" |
| #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" |
| #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" |
| #include "chrome/common/chrome_switches.h" |
| #include "chrome/common/pref_names.h" |
| #include "chromeos/chromeos_switches.h" |
| +#include "components/signin/core/browser/signin_manager.h" |
| #include "components/user_manager/user_manager.h" |
| #include "content/public/browser/notification_service.h" |
| #include "content/public/test/test_utils.h" |
| @@ -1204,8 +1206,9 @@ class MultiProfileFileManagerBrowserTest : public FileManagerBrowserTestBase { |
| user_manager->UserLoggedIn(info.email, info.hash, false); |
| user_manager->SaveUserDisplayName(info.email, |
| base::UTF8ToUTF16(info.display_name)); |
| - chromeos::ProfileHelper::GetProfileByUserIdHash(info.hash)->GetPrefs()-> |
| - SetString(prefs::kGoogleServicesUsername, info.email); |
| + SigninManagerFactory::GetForProfile( |
| + chromeos::ProfileHelper::GetProfileByUserIdHash(info.hash))-> |
|
xiyuan
2014/12/04 19:02:29
nit: fix indent
Roger Tawa OOO till Jul 10th
2014/12/04 22:26:47
Done.
|
| + SetAuthenticatedUsername(info.email); |
| } |
| private: |