diff options
| author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-15 09:22:58 +0000 |
|---|---|---|
| committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-15 09:24:19 +0000 |
| commit | 4d3907860d4d46a98f07c59ba69125be0faab404 (patch) | |
| tree | 305014dd85fd28832ebc1b5acda4865747583241 /chrome/browser/performance_monitor | |
| parent | 502c06e7deef18b28a0795222521aeffe83c209d (diff) | |
| download | chromium_src-4d3907860d4d46a98f07c59ba69125be0faab404.zip chromium_src-4d3907860d4d46a98f07c59ba69125be0faab404.tar.gz chromium_src-4d3907860d4d46a98f07c59ba69125be0faab404.tar.bz2 | |
[cros] user_manager component - move UserManagerBase and UserManager
* Move UserManager test helper classes in their own files
* Move RemoveUserDelegate to user_manager component
* Move UserManager ownership to BrowserProcessPlatformPart
* UserManager::Get() still stays but instance is explicitly initialized/cleared with instance->Initialize()|Destroy()
* ScopedUserManagerEnabler / ScopedTestUserManager classes still work
* Introduce ChromeUserManager base class (impl: ChromeUserManagerImpl)
* ChromeUserManager adds getters for MultiProfileUserController, UserImageManager, SupervisedUserManager.
All clients that were using these methods now access ChromeUserManager instance through ChromeUserManager::Get().
* FakeUserManager/MockUserManager implement ChromeUserManager
* Move *UserFlow() methods out of UserManager to ChromeUserManager
BUG=387614
TBR=thestig,benwells
Review URL: https://codereview.chromium.org/444903002
Cr-Commit-Position: refs/heads/master@{#289827}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289827 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/performance_monitor')
| -rw-r--r-- | chrome/browser/performance_monitor/performance_monitor_browsertest.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc index ee0d5f2..81519c9f 100644 --- a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc +++ b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc @@ -45,9 +45,9 @@ #include "extensions/common/extension.h" #if defined(OS_CHROMEOS) -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chromeos/chromeos_switches.h" +#include "components/user_manager/user_manager.h" #endif #if defined(OS_MACOSX) @@ -359,9 +359,8 @@ class PerformanceMonitorUncleanExitBrowserTest virtual void AddSecondUserAccount() { // Add second user account for multi-profile test. if (GetParam()) { - chromeos::UserManager::Get()->UserLoggedIn(kSecondProfileAccount, - kSecondProfileHash, - false); + user_manager::UserManager::Get()->UserLoggedIn( + kSecondProfileAccount, kSecondProfileHash, false); } } #endif |