summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/preferences_unittest.cc
diff options
context:
space:
mode:
authornkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-15 09:22:58 +0000
committernkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-15 09:24:19 +0000
commit4d3907860d4d46a98f07c59ba69125be0faab404 (patch)
tree305014dd85fd28832ebc1b5acda4865747583241 /chrome/browser/chromeos/preferences_unittest.cc
parent502c06e7deef18b28a0795222521aeffe83c209d (diff)
downloadchromium_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/chromeos/preferences_unittest.cc')
-rw-r--r--chrome/browser/chromeos/preferences_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/preferences_unittest.cc b/chrome/browser/chromeos/preferences_unittest.cc
index 0f444d0..62cc543 100644
--- a/chrome/browser/chromeos/preferences_unittest.cc
+++ b/chrome/browser/chromeos/preferences_unittest.cc
@@ -7,7 +7,7 @@
#include "base/prefs/pref_member.h"
#include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
#include "chrome/browser/chromeos/login/users/fake_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/download/download_prefs.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_pref_service_syncable.h"