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

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

Issue 2504513002: Make FakeChromeUserManager subclass of ChromeUserManager (Closed)
Patch Set: Addressed comment Created 4 years, 1 month 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/scoped_user_manager_enabler.cc
diff --git a/chrome/browser/chromeos/login/users/scoped_user_manager_enabler.cc b/chrome/browser/chromeos/login/users/scoped_user_manager_enabler.cc
index 8ae87befb01faf52a9aac55b247af740ebe3f977..8b73964fba5a965fe030a1dcea8e545b2d1a4851 100644
--- a/chrome/browser/chromeos/login/users/scoped_user_manager_enabler.cc
+++ b/chrome/browser/chromeos/login/users/scoped_user_manager_enabler.cc
@@ -4,12 +4,12 @@
#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
-#include "components/user_manager/user_manager.h"
+#include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
namespace chromeos {
ScopedUserManagerEnabler::ScopedUserManagerEnabler(
- user_manager::UserManager* user_manager) {
+ ChromeUserManager* user_manager) {
if (user_manager::UserManager::GetForTesting())
user_manager::UserManager::GetForTesting()->Shutdown();
@@ -21,7 +21,7 @@ ScopedUserManagerEnabler::~ScopedUserManagerEnabler() {
// Shutdown and destroy current UserManager instance that we track.
user_manager::UserManager::Get()->Shutdown();
delete user_manager::UserManager::Get();
- user_manager::UserManager::SetInstance(NULL);
+ user_manager::UserManager::SetInstance(nullptr);
user_manager::UserManager::SetForTesting(previous_user_manager_);
}

Powered by Google App Engine
This is Rietveld 408576698