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

Side by Side Diff: chrome/browser/chromeos/settings/device_settings_service_unittest.cc

Issue 14927015: Translate device-local account IDs to user IDs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed DeviceLocalAccountTest. Created 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/settings/device_settings_service.h" 5 #include "chrome/browser/chromeos/settings/device_settings_service.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 is_owner_(true), 51 is_owner_(true),
52 ownership_status_(DeviceSettingsService::OWNERSHIP_UNKNOWN) {} 52 ownership_status_(DeviceSettingsService::OWNERSHIP_UNKNOWN) {}
53 53
54 virtual void SetUp() OVERRIDE { 54 virtual void SetUp() OVERRIDE {
55 device_policy_.payload().mutable_device_policy_refresh_rate()-> 55 device_policy_.payload().mutable_device_policy_refresh_rate()->
56 set_device_policy_refresh_rate(120); 56 set_device_policy_refresh_rate(120);
57 DeviceSettingsTestBase::SetUp(); 57 DeviceSettingsTestBase::SetUp();
58 } 58 }
59 59
60 void CheckPolicy() { 60 void CheckPolicy() {
61 ASSERT_TRUE(device_settings_service_.policy_data()); 61 ASSERT_TRUE(DeviceSettingsService::Get()->policy_data());
62 EXPECT_EQ(device_policy_.policy_data().SerializeAsString(), 62 EXPECT_EQ(device_policy_.policy_data().SerializeAsString(),
63 device_settings_service_.policy_data()->SerializeAsString()); 63 DeviceSettingsService::Get()->policy_data()->SerializeAsString());
64 ASSERT_TRUE(device_settings_service_.device_settings()); 64 ASSERT_TRUE(DeviceSettingsService::Get()->device_settings());
65 EXPECT_EQ(device_policy_.payload().SerializeAsString(), 65 EXPECT_EQ(
66 device_settings_service_.device_settings()->SerializeAsString()); 66 device_policy_.payload().SerializeAsString(),
67 DeviceSettingsService::Get()->device_settings()->SerializeAsString());
67 } 68 }
68 69
69 bool operation_completed_; 70 bool operation_completed_;
70 bool is_owner_; 71 bool is_owner_;
71 DeviceSettingsService::OwnershipStatus ownership_status_; 72 DeviceSettingsService::OwnershipStatus ownership_status_;
72 73
73 private: 74 private:
74 DISALLOW_COPY_AND_ASSIGN(DeviceSettingsServiceTest); 75 DISALLOW_COPY_AND_ASSIGN(DeviceSettingsServiceTest);
75 }; 76 };
76 77
77 TEST_F(DeviceSettingsServiceTest, LoadNoKey) { 78 TEST_F(DeviceSettingsServiceTest, LoadNoKey) {
78 owner_key_util_->Clear(); 79 owner_key_util_->Clear();
79 ReloadDeviceSettings(); 80 ReloadDeviceSettings();
80 81
81 EXPECT_EQ(DeviceSettingsService::STORE_KEY_UNAVAILABLE, 82 EXPECT_EQ(DeviceSettingsService::STORE_KEY_UNAVAILABLE,
82 device_settings_service_.status()); 83 DeviceSettingsService::Get()->status());
83 EXPECT_FALSE(device_settings_service_.policy_data()); 84 EXPECT_FALSE(DeviceSettingsService::Get()->policy_data());
84 EXPECT_FALSE(device_settings_service_.device_settings()); 85 EXPECT_FALSE(DeviceSettingsService::Get()->device_settings());
85 } 86 }
86 87
87 TEST_F(DeviceSettingsServiceTest, LoadNoPolicy) { 88 TEST_F(DeviceSettingsServiceTest, LoadNoPolicy) {
88 device_settings_test_helper_.set_policy_blob(std::string()); 89 device_settings_test_helper_.set_policy_blob(std::string());
89 ReloadDeviceSettings(); 90 ReloadDeviceSettings();
90 91
91 EXPECT_EQ(DeviceSettingsService::STORE_NO_POLICY, 92 EXPECT_EQ(DeviceSettingsService::STORE_NO_POLICY,
92 device_settings_service_.status()); 93 DeviceSettingsService::Get()->status());
93 EXPECT_FALSE(device_settings_service_.policy_data()); 94 EXPECT_FALSE(DeviceSettingsService::Get()->policy_data());
94 EXPECT_FALSE(device_settings_service_.device_settings()); 95 EXPECT_FALSE(DeviceSettingsService::Get()->device_settings());
95 } 96 }
96 97
97 TEST_F(DeviceSettingsServiceTest, LoadValidationError) { 98 TEST_F(DeviceSettingsServiceTest, LoadValidationError) {
98 device_policy_.policy().set_policy_data_signature("bad"); 99 device_policy_.policy().set_policy_data_signature("bad");
99 device_settings_test_helper_.set_policy_blob(device_policy_.GetBlob()); 100 device_settings_test_helper_.set_policy_blob(device_policy_.GetBlob());
100 owner_key_util_->SetPublicKeyFromPrivateKey(device_policy_.signing_key()); 101 owner_key_util_->SetPublicKeyFromPrivateKey(device_policy_.signing_key());
101 ReloadDeviceSettings(); 102 ReloadDeviceSettings();
102 103
103 EXPECT_EQ(DeviceSettingsService::STORE_VALIDATION_ERROR, 104 EXPECT_EQ(DeviceSettingsService::STORE_VALIDATION_ERROR,
104 device_settings_service_.status()); 105 DeviceSettingsService::Get()->status());
105 EXPECT_FALSE(device_settings_service_.policy_data()); 106 EXPECT_FALSE(DeviceSettingsService::Get()->policy_data());
106 EXPECT_FALSE(device_settings_service_.device_settings()); 107 EXPECT_FALSE(DeviceSettingsService::Get()->device_settings());
107 } 108 }
108 109
109 TEST_F(DeviceSettingsServiceTest, LoadValidationErrorFutureTimestamp) { 110 TEST_F(DeviceSettingsServiceTest, LoadValidationErrorFutureTimestamp) {
110 base::Time timestamp(base::Time::NowFromSystemTime() + 111 base::Time timestamp(base::Time::NowFromSystemTime() +
111 base::TimeDelta::FromDays(5000)); 112 base::TimeDelta::FromDays(5000));
112 device_policy_.policy_data().set_timestamp( 113 device_policy_.policy_data().set_timestamp(
113 (timestamp - base::Time::UnixEpoch()).InMilliseconds()); 114 (timestamp - base::Time::UnixEpoch()).InMilliseconds());
114 device_policy_.Build(); 115 device_policy_.Build();
115 device_settings_test_helper_.set_policy_blob(device_policy_.GetBlob()); 116 device_settings_test_helper_.set_policy_blob(device_policy_.GetBlob());
116 owner_key_util_->SetPublicKeyFromPrivateKey(device_policy_.signing_key()); 117 owner_key_util_->SetPublicKeyFromPrivateKey(device_policy_.signing_key());
117 ReloadDeviceSettings(); 118 ReloadDeviceSettings();
118 119
119 EXPECT_EQ(DeviceSettingsService::STORE_TEMP_VALIDATION_ERROR, 120 EXPECT_EQ(DeviceSettingsService::STORE_TEMP_VALIDATION_ERROR,
120 device_settings_service_.status()); 121 DeviceSettingsService::Get()->status());
121 EXPECT_FALSE(device_settings_service_.policy_data()); 122 EXPECT_FALSE(DeviceSettingsService::Get()->policy_data());
122 EXPECT_FALSE(device_settings_service_.device_settings()); 123 EXPECT_FALSE(DeviceSettingsService::Get()->device_settings());
123 } 124 }
124 125
125 TEST_F(DeviceSettingsServiceTest, LoadSuccess) { 126 TEST_F(DeviceSettingsServiceTest, LoadSuccess) {
126 ReloadDeviceSettings(); 127 ReloadDeviceSettings();
127 128
128 EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS, 129 EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS,
129 device_settings_service_.status()); 130 DeviceSettingsService::Get()->status());
130 CheckPolicy(); 131 CheckPolicy();
131 } 132 }
132 133
133 TEST_F(DeviceSettingsServiceTest, SignAndStoreNoKey) { 134 TEST_F(DeviceSettingsServiceTest, SignAndStoreNoKey) {
134 ReloadDeviceSettings(); 135 ReloadDeviceSettings();
135 EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS, 136 EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS,
136 device_settings_service_.status()); 137 DeviceSettingsService::Get()->status());
137 138
138 scoped_ptr<em::ChromeDeviceSettingsProto> new_device_settings( 139 scoped_ptr<em::ChromeDeviceSettingsProto> new_device_settings(
139 new em::ChromeDeviceSettingsProto(device_policy_.payload())); 140 new em::ChromeDeviceSettingsProto(device_policy_.payload()));
140 new_device_settings->mutable_device_policy_refresh_rate()-> 141 new_device_settings->mutable_device_policy_refresh_rate()->
141 set_device_policy_refresh_rate(300); 142 set_device_policy_refresh_rate(300);
142 device_settings_service_.SignAndStore( 143 DeviceSettingsService::Get()->SignAndStore(
143 new_device_settings.Pass(), 144 new_device_settings.Pass(),
144 base::Bind(&DeviceSettingsServiceTest::SetOperationCompleted, 145 base::Bind(&DeviceSettingsServiceTest::SetOperationCompleted,
145 base::Unretained(this))); 146 base::Unretained(this)));
146 FlushDeviceSettings(); 147 FlushDeviceSettings();
147 EXPECT_TRUE(operation_completed_); 148 EXPECT_TRUE(operation_completed_);
148 EXPECT_EQ(DeviceSettingsService::STORE_KEY_UNAVAILABLE, 149 EXPECT_EQ(DeviceSettingsService::STORE_KEY_UNAVAILABLE,
149 device_settings_service_.status()); 150 DeviceSettingsService::Get()->status());
150 CheckPolicy(); 151 CheckPolicy();
151 } 152 }
152 153
153 TEST_F(DeviceSettingsServiceTest, SignAndStoreFailure) { 154 TEST_F(DeviceSettingsServiceTest, SignAndStoreFailure) {
154 ReloadDeviceSettings(); 155 ReloadDeviceSettings();
155 EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS, 156 EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS,
156 device_settings_service_.status()); 157 DeviceSettingsService::Get()->status());
157 158
158 owner_key_util_->SetPrivateKey(device_policy_.signing_key()); 159 owner_key_util_->SetPrivateKey(device_policy_.signing_key());
159 device_settings_service_.SetUsername(device_policy_.policy_data().username()); 160 DeviceSettingsService::Get()->SetUsername(
161 device_policy_.policy_data().username());
160 FlushDeviceSettings(); 162 FlushDeviceSettings();
161 163
162 scoped_ptr<em::ChromeDeviceSettingsProto> new_device_settings( 164 scoped_ptr<em::ChromeDeviceSettingsProto> new_device_settings(
163 new em::ChromeDeviceSettingsProto(device_policy_.payload())); 165 new em::ChromeDeviceSettingsProto(device_policy_.payload()));
164 new_device_settings->mutable_device_policy_refresh_rate()-> 166 new_device_settings->mutable_device_policy_refresh_rate()->
165 set_device_policy_refresh_rate(300); 167 set_device_policy_refresh_rate(300);
166 device_settings_test_helper_.set_store_result(false); 168 device_settings_test_helper_.set_store_result(false);
167 device_settings_service_.SignAndStore( 169 DeviceSettingsService::Get()->SignAndStore(
168 new_device_settings.Pass(), 170 new_device_settings.Pass(),
169 base::Bind(&DeviceSettingsServiceTest::SetOperationCompleted, 171 base::Bind(&DeviceSettingsServiceTest::SetOperationCompleted,
170 base::Unretained(this))); 172 base::Unretained(this)));
171 FlushDeviceSettings(); 173 FlushDeviceSettings();
172 EXPECT_TRUE(operation_completed_); 174 EXPECT_TRUE(operation_completed_);
173 EXPECT_EQ(DeviceSettingsService::STORE_OPERATION_FAILED, 175 EXPECT_EQ(DeviceSettingsService::STORE_OPERATION_FAILED,
174 device_settings_service_.status()); 176 DeviceSettingsService::Get()->status());
175 CheckPolicy(); 177 CheckPolicy();
176 } 178 }
177 179
178 TEST_F(DeviceSettingsServiceTest, SignAndStoreSuccess) { 180 TEST_F(DeviceSettingsServiceTest, SignAndStoreSuccess) {
179 ReloadDeviceSettings(); 181 ReloadDeviceSettings();
180 EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS, 182 EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS,
181 device_settings_service_.status()); 183 DeviceSettingsService::Get()->status());
182 184
183 owner_key_util_->SetPrivateKey(device_policy_.signing_key()); 185 owner_key_util_->SetPrivateKey(device_policy_.signing_key());
184 device_settings_service_.SetUsername(device_policy_.policy_data().username()); 186 DeviceSettingsService::Get()->SetUsername(
187 device_policy_.policy_data().username());
185 FlushDeviceSettings(); 188 FlushDeviceSettings();
186 189
187 device_policy_.payload().mutable_device_policy_refresh_rate()-> 190 device_policy_.payload().mutable_device_policy_refresh_rate()->
188 set_device_policy_refresh_rate(300); 191 set_device_policy_refresh_rate(300);
189 device_policy_.Build(); 192 device_policy_.Build();
190 device_settings_service_.SignAndStore( 193 DeviceSettingsService::Get()->SignAndStore(
191 scoped_ptr<em::ChromeDeviceSettingsProto>( 194 scoped_ptr<em::ChromeDeviceSettingsProto>(
192 new em::ChromeDeviceSettingsProto(device_policy_.payload())), 195 new em::ChromeDeviceSettingsProto(device_policy_.payload())),
193 base::Bind(&DeviceSettingsServiceTest::SetOperationCompleted, 196 base::Bind(&DeviceSettingsServiceTest::SetOperationCompleted,
194 base::Unretained(this))); 197 base::Unretained(this)));
195 FlushDeviceSettings(); 198 FlushDeviceSettings();
196 EXPECT_TRUE(operation_completed_); 199 EXPECT_TRUE(operation_completed_);
197 EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS, 200 EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS,
198 device_settings_service_.status()); 201 DeviceSettingsService::Get()->status());
199 ASSERT_TRUE(device_settings_service_.device_settings()); 202 ASSERT_TRUE(DeviceSettingsService::Get()->device_settings());
200 EXPECT_EQ(device_policy_.payload().SerializeAsString(), 203 EXPECT_EQ(
201 device_settings_service_.device_settings()->SerializeAsString()); 204 device_policy_.payload().SerializeAsString(),
205 DeviceSettingsService::Get()->device_settings()->SerializeAsString());
202 } 206 }
203 207
204 TEST_F(DeviceSettingsServiceTest, StoreFailure) { 208 TEST_F(DeviceSettingsServiceTest, StoreFailure) {
205 owner_key_util_->Clear(); 209 owner_key_util_->Clear();
206 device_settings_test_helper_.set_policy_blob(std::string()); 210 device_settings_test_helper_.set_policy_blob(std::string());
207 ReloadDeviceSettings(); 211 ReloadDeviceSettings();
208 EXPECT_EQ(DeviceSettingsService::STORE_KEY_UNAVAILABLE, 212 EXPECT_EQ(DeviceSettingsService::STORE_KEY_UNAVAILABLE,
209 device_settings_service_.status()); 213 DeviceSettingsService::Get()->status());
210 214
211 device_settings_test_helper_.set_store_result(false); 215 device_settings_test_helper_.set_store_result(false);
212 device_settings_service_.Store( 216 DeviceSettingsService::Get()->Store(
213 device_policy_.GetCopy(), 217 device_policy_.GetCopy(),
214 base::Bind(&DeviceSettingsServiceTest::SetOperationCompleted, 218 base::Bind(&DeviceSettingsServiceTest::SetOperationCompleted,
215 base::Unretained(this))); 219 base::Unretained(this)));
216 FlushDeviceSettings(); 220 FlushDeviceSettings();
217 EXPECT_TRUE(operation_completed_); 221 EXPECT_TRUE(operation_completed_);
218 EXPECT_EQ(DeviceSettingsService::STORE_OPERATION_FAILED, 222 EXPECT_EQ(DeviceSettingsService::STORE_OPERATION_FAILED,
219 device_settings_service_.status()); 223 DeviceSettingsService::Get()->status());
220 } 224 }
221 225
222 TEST_F(DeviceSettingsServiceTest, StoreSuccess) { 226 TEST_F(DeviceSettingsServiceTest, StoreSuccess) {
223 owner_key_util_->Clear(); 227 owner_key_util_->Clear();
224 device_settings_test_helper_.set_policy_blob(std::string()); 228 device_settings_test_helper_.set_policy_blob(std::string());
225 ReloadDeviceSettings(); 229 ReloadDeviceSettings();
226 EXPECT_EQ(DeviceSettingsService::STORE_KEY_UNAVAILABLE, 230 EXPECT_EQ(DeviceSettingsService::STORE_KEY_UNAVAILABLE,
227 device_settings_service_.status()); 231 DeviceSettingsService::Get()->status());
228 232
229 owner_key_util_->SetPublicKeyFromPrivateKey(device_policy_.signing_key()); 233 owner_key_util_->SetPublicKeyFromPrivateKey(device_policy_.signing_key());
230 device_settings_service_.Store( 234 DeviceSettingsService::Get()->Store(
231 device_policy_.GetCopy(), 235 device_policy_.GetCopy(),
232 base::Bind(&DeviceSettingsServiceTest::SetOperationCompleted, 236 base::Bind(&DeviceSettingsServiceTest::SetOperationCompleted,
233 base::Unretained(this))); 237 base::Unretained(this)));
234 FlushDeviceSettings(); 238 FlushDeviceSettings();
235 EXPECT_TRUE(operation_completed_); 239 EXPECT_TRUE(operation_completed_);
236 EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS, 240 EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS,
237 device_settings_service_.status()); 241 DeviceSettingsService::Get()->status());
238 CheckPolicy(); 242 CheckPolicy();
239 } 243 }
240 244
241 TEST_F(DeviceSettingsServiceTest, StoreRotation) { 245 TEST_F(DeviceSettingsServiceTest, StoreRotation) {
242 ReloadDeviceSettings(); 246 ReloadDeviceSettings();
243 EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS, 247 EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS,
244 device_settings_service_.status()); 248 DeviceSettingsService::Get()->status());
245 249
246 device_policy_.payload().mutable_device_policy_refresh_rate()-> 250 device_policy_.payload().mutable_device_policy_refresh_rate()->
247 set_device_policy_refresh_rate(300); 251 set_device_policy_refresh_rate(300);
248 device_policy_.set_new_signing_key( 252 device_policy_.set_new_signing_key(
249 policy::PolicyBuilder::CreateTestNewSigningKey()); 253 policy::PolicyBuilder::CreateTestNewSigningKey());
250 device_policy_.Build(); 254 device_policy_.Build();
251 device_settings_service_.Store(device_policy_.GetCopy(), base::Closure()); 255 DeviceSettingsService::Get()->Store(device_policy_.GetCopy(),
256 base::Closure());
252 FlushDeviceSettings(); 257 FlushDeviceSettings();
253 owner_key_util_->SetPublicKeyFromPrivateKey(device_policy_.new_signing_key()); 258 owner_key_util_->SetPublicKeyFromPrivateKey(device_policy_.new_signing_key());
254 device_settings_service_.OwnerKeySet(true); 259 DeviceSettingsService::Get()->OwnerKeySet(true);
255 FlushDeviceSettings(); 260 FlushDeviceSettings();
256 EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS, 261 EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS,
257 device_settings_service_.status()); 262 DeviceSettingsService::Get()->status());
258 CheckPolicy(); 263 CheckPolicy();
259 264
260 // Check the new key has been loaded. 265 // Check the new key has been loaded.
261 std::vector<uint8> key; 266 std::vector<uint8> key;
262 ASSERT_TRUE(device_policy_.new_signing_key()->ExportPublicKey(&key)); 267 ASSERT_TRUE(device_policy_.new_signing_key()->ExportPublicKey(&key));
263 EXPECT_EQ(*device_settings_service_.GetOwnerKey()->public_key(), key); 268 EXPECT_EQ(*DeviceSettingsService::Get()->GetOwnerKey()->public_key(), key);
264 } 269 }
265 270
266 TEST_F(DeviceSettingsServiceTest, OwnershipStatus) { 271 TEST_F(DeviceSettingsServiceTest, OwnershipStatus) {
267 owner_key_util_->Clear(); 272 owner_key_util_->Clear();
268 273
269 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); 274 EXPECT_FALSE(DeviceSettingsService::Get()->HasPrivateOwnerKey());
270 EXPECT_FALSE(device_settings_service_.GetOwnerKey()); 275 EXPECT_FALSE(DeviceSettingsService::Get()->GetOwnerKey());
271 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_UNKNOWN, 276 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_UNKNOWN,
272 device_settings_service_.GetOwnershipStatus()); 277 DeviceSettingsService::Get()->GetOwnershipStatus());
273 278
274 device_settings_service_.GetOwnershipStatusAsync( 279 DeviceSettingsService::Get()->GetOwnershipStatusAsync(
275 base::Bind(&DeviceSettingsServiceTest::SetOwnershipStatus, 280 base::Bind(&DeviceSettingsServiceTest::SetOwnershipStatus,
276 base::Unretained(this))); 281 base::Unretained(this)));
277 FlushDeviceSettings(); 282 FlushDeviceSettings();
278 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); 283 EXPECT_FALSE(DeviceSettingsService::Get()->HasPrivateOwnerKey());
279 ASSERT_TRUE(device_settings_service_.GetOwnerKey()); 284 ASSERT_TRUE(DeviceSettingsService::Get()->GetOwnerKey());
280 EXPECT_FALSE(device_settings_service_.GetOwnerKey()->public_key()); 285 EXPECT_FALSE(DeviceSettingsService::Get()->GetOwnerKey()->public_key());
281 EXPECT_FALSE(device_settings_service_.GetOwnerKey()->private_key()); 286 EXPECT_FALSE(DeviceSettingsService::Get()->GetOwnerKey()->private_key());
282 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_NONE, 287 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_NONE,
283 device_settings_service_.GetOwnershipStatus()); 288 DeviceSettingsService::Get()->GetOwnershipStatus());
284 EXPECT_FALSE(is_owner_); 289 EXPECT_FALSE(is_owner_);
285 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_NONE, ownership_status_); 290 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_NONE, ownership_status_);
286 291
287 owner_key_util_->SetPublicKeyFromPrivateKey(device_policy_.signing_key()); 292 owner_key_util_->SetPublicKeyFromPrivateKey(device_policy_.signing_key());
288 ReloadDeviceSettings(); 293 ReloadDeviceSettings();
289 device_settings_service_.GetOwnershipStatusAsync( 294 DeviceSettingsService::Get()->GetOwnershipStatusAsync(
290 base::Bind(&DeviceSettingsServiceTest::SetOwnershipStatus, 295 base::Bind(&DeviceSettingsServiceTest::SetOwnershipStatus,
291 base::Unretained(this))); 296 base::Unretained(this)));
292 FlushDeviceSettings(); 297 FlushDeviceSettings();
293 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); 298 EXPECT_FALSE(DeviceSettingsService::Get()->HasPrivateOwnerKey());
294 ASSERT_TRUE(device_settings_service_.GetOwnerKey()); 299 ASSERT_TRUE(DeviceSettingsService::Get()->GetOwnerKey());
295 ASSERT_TRUE(device_settings_service_.GetOwnerKey()->public_key()); 300 ASSERT_TRUE(DeviceSettingsService::Get()->GetOwnerKey()->public_key());
296 std::vector<uint8> key; 301 std::vector<uint8> key;
297 ASSERT_TRUE(device_policy_.signing_key()->ExportPublicKey(&key)); 302 ASSERT_TRUE(device_policy_.signing_key()->ExportPublicKey(&key));
298 EXPECT_EQ(*device_settings_service_.GetOwnerKey()->public_key(), key); 303 EXPECT_EQ(*DeviceSettingsService::Get()->GetOwnerKey()->public_key(), key);
299 EXPECT_FALSE(device_settings_service_.GetOwnerKey()->private_key()); 304 EXPECT_FALSE(DeviceSettingsService::Get()->GetOwnerKey()->private_key());
300 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, 305 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN,
301 device_settings_service_.GetOwnershipStatus()); 306 DeviceSettingsService::Get()->GetOwnershipStatus());
302 EXPECT_FALSE(is_owner_); 307 EXPECT_FALSE(is_owner_);
303 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, ownership_status_); 308 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, ownership_status_);
304 309
305 owner_key_util_->SetPrivateKey(device_policy_.signing_key()); 310 owner_key_util_->SetPrivateKey(device_policy_.signing_key());
306 device_settings_service_.SetUsername(device_policy_.policy_data().username()); 311 DeviceSettingsService::Get()->SetUsername(
307 device_settings_service_.GetOwnershipStatusAsync( 312 device_policy_.policy_data().username());
313 DeviceSettingsService::Get()->GetOwnershipStatusAsync(
308 base::Bind(&DeviceSettingsServiceTest::SetOwnershipStatus, 314 base::Bind(&DeviceSettingsServiceTest::SetOwnershipStatus,
309 base::Unretained(this))); 315 base::Unretained(this)));
310 FlushDeviceSettings(); 316 FlushDeviceSettings();
311 EXPECT_TRUE(device_settings_service_.HasPrivateOwnerKey()); 317 EXPECT_TRUE(DeviceSettingsService::Get()->HasPrivateOwnerKey());
312 ASSERT_TRUE(device_settings_service_.GetOwnerKey()); 318 ASSERT_TRUE(DeviceSettingsService::Get()->GetOwnerKey());
313 ASSERT_TRUE(device_settings_service_.GetOwnerKey()->public_key()); 319 ASSERT_TRUE(DeviceSettingsService::Get()->GetOwnerKey()->public_key());
314 ASSERT_TRUE(device_policy_.signing_key()->ExportPublicKey(&key)); 320 ASSERT_TRUE(device_policy_.signing_key()->ExportPublicKey(&key));
315 EXPECT_EQ(*device_settings_service_.GetOwnerKey()->public_key(), key); 321 EXPECT_EQ(*DeviceSettingsService::Get()->GetOwnerKey()->public_key(), key);
316 EXPECT_TRUE(device_settings_service_.GetOwnerKey()->private_key()); 322 EXPECT_TRUE(DeviceSettingsService::Get()->GetOwnerKey()->private_key());
317 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, 323 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN,
318 device_settings_service_.GetOwnershipStatus()); 324 DeviceSettingsService::Get()->GetOwnershipStatus());
319 EXPECT_TRUE(is_owner_); 325 EXPECT_TRUE(is_owner_);
320 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, ownership_status_); 326 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, ownership_status_);
321 } 327 }
322 328
323 TEST_F(DeviceSettingsServiceTest, Observer) { 329 TEST_F(DeviceSettingsServiceTest, Observer) {
324 owner_key_util_->Clear(); 330 owner_key_util_->Clear();
325 MockDeviceSettingsObserver observer_; 331 MockDeviceSettingsObserver observer_;
326 device_settings_service_.AddObserver(&observer_); 332 DeviceSettingsService::Get()->AddObserver(&observer_);
327 333
328 EXPECT_CALL(observer_, OwnershipStatusChanged()).Times(1); 334 EXPECT_CALL(observer_, OwnershipStatusChanged()).Times(1);
329 EXPECT_CALL(observer_, DeviceSettingsUpdated()).Times(1); 335 EXPECT_CALL(observer_, DeviceSettingsUpdated()).Times(1);
330 ReloadDeviceSettings(); 336 ReloadDeviceSettings();
331 Mock::VerifyAndClearExpectations(&observer_); 337 Mock::VerifyAndClearExpectations(&observer_);
332 338
333 EXPECT_CALL(observer_, OwnershipStatusChanged()).Times(1); 339 EXPECT_CALL(observer_, OwnershipStatusChanged()).Times(1);
334 EXPECT_CALL(observer_, DeviceSettingsUpdated()).Times(1); 340 EXPECT_CALL(observer_, DeviceSettingsUpdated()).Times(1);
335 owner_key_util_->SetPublicKeyFromPrivateKey(device_policy_.signing_key()); 341 owner_key_util_->SetPublicKeyFromPrivateKey(device_policy_.signing_key());
336 ReloadDeviceSettings(); 342 ReloadDeviceSettings();
337 Mock::VerifyAndClearExpectations(&observer_); 343 Mock::VerifyAndClearExpectations(&observer_);
338 344
339 EXPECT_CALL(observer_, OwnershipStatusChanged()).Times(0); 345 EXPECT_CALL(observer_, OwnershipStatusChanged()).Times(0);
340 EXPECT_CALL(observer_, DeviceSettingsUpdated()).Times(1); 346 EXPECT_CALL(observer_, DeviceSettingsUpdated()).Times(1);
341 device_settings_service_.Store(device_policy_.GetCopy(), base::Closure()); 347 DeviceSettingsService::Get()->Store(device_policy_.GetCopy(),
348 base::Closure());
342 FlushDeviceSettings(); 349 FlushDeviceSettings();
343 Mock::VerifyAndClearExpectations(&observer_); 350 Mock::VerifyAndClearExpectations(&observer_);
344 351
345 EXPECT_CALL(observer_, OwnershipStatusChanged()).Times(0); 352 EXPECT_CALL(observer_, OwnershipStatusChanged()).Times(0);
346 EXPECT_CALL(observer_, DeviceSettingsUpdated()).Times(1); 353 EXPECT_CALL(observer_, DeviceSettingsUpdated()).Times(1);
347 device_settings_service_.PropertyChangeComplete(true); 354 DeviceSettingsService::Get()->PropertyChangeComplete(true);
348 FlushDeviceSettings(); 355 FlushDeviceSettings();
349 Mock::VerifyAndClearExpectations(&observer_); 356 Mock::VerifyAndClearExpectations(&observer_);
350 357
351 device_settings_service_.RemoveObserver(&observer_); 358 DeviceSettingsService::Get()->RemoveObserver(&observer_);
352 } 359 }
353 360
354 } // namespace chromeos 361 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698