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

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

Issue 393343002: Rename "managed (mode|user)" to "supervised user" (part 7) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more alphabetize (and rebase again) 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 unified diff | Download patch | Annotate | Revision Log
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 <cstdlib> 5 #include <cstdlib>
6 #include <cstring> 6 #include <cstring>
7 7
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/scoped_temp_dir.h" 9 #include "base/files/scoped_temp_dir.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 void ResetUserManager() { 126 void ResetUserManager() {
127 // Reset the UserManager singleton. 127 // Reset the UserManager singleton.
128 user_manager_enabler_.reset(); 128 user_manager_enabler_.reset();
129 // Initialize the UserManager singleton to a fresh UserManagerImpl instance. 129 // Initialize the UserManager singleton to a fresh UserManagerImpl instance.
130 user_manager_enabler_.reset( 130 user_manager_enabler_.reset(
131 new ScopedUserManagerEnabler(new UserManagerImpl)); 131 new ScopedUserManagerEnabler(new UserManagerImpl));
132 } 132 }
133 133
134 void SetDeviceSettings(bool ephemeral_users_enabled, 134 void SetDeviceSettings(bool ephemeral_users_enabled,
135 const std::string &owner, 135 const std::string &owner,
136 bool locally_managed_users_enabled) { 136 bool supervised_users_enabled) {
137 base::FundamentalValue 137 base::FundamentalValue
138 ephemeral_users_enabled_value(ephemeral_users_enabled); 138 ephemeral_users_enabled_value(ephemeral_users_enabled);
139 stub_settings_provider_.Set(kAccountsPrefEphemeralUsersEnabled, 139 stub_settings_provider_.Set(kAccountsPrefEphemeralUsersEnabled,
140 ephemeral_users_enabled_value); 140 ephemeral_users_enabled_value);
141 base::StringValue owner_value(owner); 141 base::StringValue owner_value(owner);
142 stub_settings_provider_.Set(kDeviceOwner, owner_value); 142 stub_settings_provider_.Set(kDeviceOwner, owner_value);
143 stub_settings_provider_.Set(kAccountsPrefSupervisedUsersEnabled, 143 stub_settings_provider_.Set(kAccountsPrefSupervisedUsersEnabled,
144 base::FundamentalValue(locally_managed_users_enabled)); 144 base::FundamentalValue(supervised_users_enabled));
145 } 145 }
146 146
147 void RetrieveTrustedDevicePolicies() { 147 void RetrieveTrustedDevicePolicies() {
148 GetUserManagerImpl()->RetrieveTrustedDevicePolicies(); 148 GetUserManagerImpl()->RetrieveTrustedDevicePolicies();
149 } 149 }
150 150
151 protected: 151 protected:
152 content::TestBrowserThreadBundle thread_bundle_; 152 content::TestBrowserThreadBundle thread_bundle_;
153 153
154 CrosSettings* cros_settings_; 154 CrosSettings* cros_settings_;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 UserManager::Get()->UserLoggedIn( 209 UserManager::Get()->UserLoggedIn(
210 "user0@invalid.domain", "user0@invalid.domain", false); 210 "user0@invalid.domain", "user0@invalid.domain", false);
211 ResetUserManager(); 211 ResetUserManager();
212 212
213 const UserList* users = &UserManager::Get()->GetUsers(); 213 const UserList* users = &UserManager::Get()->GetUsers();
214 EXPECT_EQ(1U, users->size()); 214 EXPECT_EQ(1U, users->size());
215 EXPECT_EQ((*users)[0]->email(), "owner@invalid.domain"); 215 EXPECT_EQ((*users)[0]->email(), "owner@invalid.domain");
216 } 216 }
217 217
218 } // namespace chromeos 218 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/users/user_manager_impl.cc ('k') | chrome/browser/chromeos/login/wizard_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698