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

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

Issue 2864433003: [ARC] Add browser test of ArcAuthService (Closed)
Patch Set: Rebase Created 3 years, 7 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/fake_chrome_user_manager.cc
diff --git a/chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc b/chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc
index f361fd66171a5916c2f670db1c7462206680ce5c..aed65c8d60bc748aed8d7e2f91323d556a7259fa 100644
--- a/chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc
+++ b/chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc
@@ -19,6 +19,7 @@
#include "chrome/grit/theme_resources.h"
#include "chromeos/chromeos_switches.h"
#include "chromeos/login/login_state.h"
+#include "components/user_manager/known_user.h"
#include "components/user_manager/user_image/user_image.h"
#include "components/user_manager/user_names.h"
#include "components/user_manager/user_type.h"
@@ -472,7 +473,7 @@ void FakeChromeUserManager::SaveUserDisplayEmail(
std::string FakeChromeUserManager::GetUserDisplayEmail(
const AccountId& account_id) const {
- return std::string();
+ return account_id.GetUserEmail();
}
void FakeChromeUserManager::SaveUserType(
@@ -560,8 +561,13 @@ bool FakeChromeUserManager::AreSupervisedUsersAllowed() const {
return true;
}
+void FakeChromeUserManager::CreateLocalState() {
+ local_state_.reset(new TestingPrefServiceSimple());
Luis Héctor Chávez 2017/05/11 16:57:54 nit: = base::MakeUnique<TestingPrefServiceSimple>(
blundell 2017/05/12 09:09:32 Done.
+ user_manager::known_user::RegisterPrefs(local_state_->registry());
+}
+
PrefService* FakeChromeUserManager::GetLocalState() const {
- return nullptr;
+ return local_state_.get();
}
void FakeChromeUserManager::SetIsCurrentUserNew(bool is_new) {

Powered by Google App Engine
This is Rietveld 408576698