Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(972)

Unified Diff: chrome/browser/chromeos/login/users/user_manager_unittest.cc

Issue 417623002: user_manager component: Add UserManagerBase class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/users/user_manager_unittest.cc
diff --git a/chrome/browser/chromeos/login/users/user_manager_unittest.cc b/chrome/browser/chromeos/login/users/user_manager_unittest.cc
index ed16b5d15210f272a79596a1ff3230728487a8ec..fb047de548141958ebfe2aede8061be88304c315 100644
--- a/chrome/browser/chromeos/login/users/user_manager_unittest.cc
+++ b/chrome/browser/chromeos/login/users/user_manager_unittest.cc
@@ -12,8 +12,8 @@
#include "base/run_loop.h"
#include "base/values.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
#include "chrome/browser/chromeos/login/users/user_manager.h"
-#include "chrome/browser/chromeos/login/users/user_manager_impl.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/chromeos/settings/device_settings_service.h"
#include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"
@@ -103,32 +103,33 @@ class UserManagerTest : public testing::Test {
chromeos::DBusThreadManager::Shutdown();
}
- UserManagerImpl* GetUserManagerImpl() const {
- return static_cast<UserManagerImpl*>(UserManager::Get());
+ ChromeUserManager* GetChromeUserManager() const {
+ return static_cast<ChromeUserManager*>(UserManager::Get());
}
bool GetUserManagerEphemeralUsersEnabled() const {
- return GetUserManagerImpl()->ephemeral_users_enabled_;
+ return GetChromeUserManager()->GetEphemeralUsersEnabled();
}
void SetUserManagerEphemeralUsersEnabled(bool ephemeral_users_enabled) {
- GetUserManagerImpl()->ephemeral_users_enabled_ = ephemeral_users_enabled;
+ GetChromeUserManager()->SetEphemeralUsersEnabled(ephemeral_users_enabled);
}
const std::string& GetUserManagerOwnerEmail() const {
- return GetUserManagerImpl()-> owner_email_;
+ return GetChromeUserManager()->GetOwnerEmail();
}
void SetUserManagerOwnerEmail(const std::string& owner_email) {
- GetUserManagerImpl()->owner_email_ = owner_email;
+ GetChromeUserManager()->SetOwnerEmail(owner_email);
}
void ResetUserManager() {
// Reset the UserManager singleton.
user_manager_enabler_.reset();
- // Initialize the UserManager singleton to a fresh UserManagerImpl instance.
+ // Initialize the UserManager singleton to a fresh ChromeUserManager
+ // instance.
user_manager_enabler_.reset(
- new ScopedUserManagerEnabler(new UserManagerImpl));
+ new ScopedUserManagerEnabler(new ChromeUserManager));
}
void SetDeviceSettings(bool ephemeral_users_enabled,
@@ -145,7 +146,7 @@ class UserManagerTest : public testing::Test {
}
void RetrieveTrustedDevicePolicies() {
- GetUserManagerImpl()->RetrieveTrustedDevicePolicies();
+ GetChromeUserManager()->RetrieveTrustedDevicePolicies();
}
protected:

Powered by Google App Engine
This is Rietveld 408576698