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

Side by Side Diff: chrome/browser/chromeos/login/users/mock_user_manager.cc

Issue 1165323004: We should use UserID object to identify users instead of username. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/login/users/mock_user_manager.h" 5 #include "chrome/browser/chromeos/login/users/mock_user_manager.h"
6 6
7 #include "base/task_runner.h" 7 #include "base/task_runner.h"
8 #include "chrome/browser/chromeos/login/users/fake_supervised_user_manager.h" 8 #include "chrome/browser/chromeos/login/users/fake_supervised_user_manager.h"
9 #include "chrome/browser/chromeos/profiles/profile_helper.h" 9 #include "chrome/browser/chromeos/profiles/profile_helper.h"
10 10
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 user_manager::User* MockUserManager::CreatePublicAccountUser( 106 user_manager::User* MockUserManager::CreatePublicAccountUser(
107 const std::string& email) { 107 const std::string& email) {
108 ClearUserList(); 108 ClearUserList();
109 user_manager::User* user = user_manager::User::CreatePublicAccountUser(email); 109 user_manager::User* user = user_manager::User::CreatePublicAccountUser(email);
110 user_list_.push_back(user); 110 user_list_.push_back(user);
111 ProfileHelper::Get()->SetProfileToUserMappingForTesting(user); 111 ProfileHelper::Get()->SetProfileToUserMappingForTesting(user);
112 return user_list_.back(); 112 return user_list_.back();
113 } 113 }
114 114
115 user_manager::User* MockUserManager::CreateKioskAppUser( 115 user_manager::User* MockUserManager::CreateKioskAppUser(
116 const std::string& email) { 116 const UserID& user_id) {
117 ClearUserList(); 117 ClearUserList();
118 user_list_.push_back(user_manager::User::CreateKioskAppUser(email)); 118 user_list_.push_back(user_manager::User::CreateKioskAppUser(user_id));
119 ProfileHelper::Get()->SetProfileToUserMappingForTesting(user_list_.back()); 119 ProfileHelper::Get()->SetProfileToUserMappingForTesting(user_list_.back());
120 return user_list_.back(); 120 return user_list_.back();
121 } 121 }
122 122
123 void MockUserManager::AddUser(const std::string& email) { 123 void MockUserManager::AddUser(const user_manager::UserID& user_id) {
124 user_manager::User* user = user_manager::User::CreateRegularUser(email); 124 user_manager::User* user = user_manager::User::CreateRegularUser(user_id);
125 user_list_.push_back(user); 125 user_list_.push_back(user);
126 ProfileHelper::Get()->SetProfileToUserMappingForTesting(user); 126 ProfileHelper::Get()->SetProfileToUserMappingForTesting(user);
127 } 127 }
128 128
129 void MockUserManager::ClearUserList() { 129 void MockUserManager::ClearUserList() {
130 // Can't use STLDeleteElements because of the protected destructor of User. 130 // Can't use STLDeleteElements because of the protected destructor of User.
131 user_manager::UserList::iterator user; 131 user_manager::UserList::iterator user;
132 for (user = user_list_.begin(); user != user_list_.end(); ++user) 132 for (user = user_list_.begin(); user != user_list_.end(); ++user)
133 delete *user; 133 delete *user;
134 user_list_.clear(); 134 user_list_.clear();
135 } 135 }
136 136
137 } // namespace chromeos 137 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698