| OLD | NEW |
| 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 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 // Check the new key has been loaded. | 260 // Check the new key has been loaded. |
| 261 std::vector<uint8> key; | 261 std::vector<uint8> key; |
| 262 ASSERT_TRUE(device_policy_.new_signing_key()->ExportPublicKey(&key)); | 262 ASSERT_TRUE(device_policy_.new_signing_key()->ExportPublicKey(&key)); |
| 263 EXPECT_EQ(*device_settings_service_.GetOwnerKey()->public_key(), key); | 263 EXPECT_EQ(*device_settings_service_.GetOwnerKey()->public_key(), key); |
| 264 } | 264 } |
| 265 | 265 |
| 266 TEST_F(DeviceSettingsServiceTest, OwnershipStatus) { | 266 TEST_F(DeviceSettingsServiceTest, OwnershipStatus) { |
| 267 owner_key_util_->Clear(); | 267 owner_key_util_->Clear(); |
| 268 | 268 |
| 269 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); | 269 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); |
| 270 EXPECT_FALSE(device_settings_service_.GetOwnerKey()); | 270 EXPECT_FALSE(device_settings_service_.GetOwnerKey().get()); |
| 271 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_UNKNOWN, | 271 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_UNKNOWN, |
| 272 device_settings_service_.GetOwnershipStatus()); | 272 device_settings_service_.GetOwnershipStatus()); |
| 273 | 273 |
| 274 device_settings_service_.GetOwnershipStatusAsync( | 274 device_settings_service_.GetOwnershipStatusAsync( |
| 275 base::Bind(&DeviceSettingsServiceTest::SetOwnershipStatus, | 275 base::Bind(&DeviceSettingsServiceTest::SetOwnershipStatus, |
| 276 base::Unretained(this))); | 276 base::Unretained(this))); |
| 277 FlushDeviceSettings(); | 277 FlushDeviceSettings(); |
| 278 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); | 278 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); |
| 279 ASSERT_TRUE(device_settings_service_.GetOwnerKey()); | 279 ASSERT_TRUE(device_settings_service_.GetOwnerKey().get()); |
| 280 EXPECT_FALSE(device_settings_service_.GetOwnerKey()->public_key()); | 280 EXPECT_FALSE(device_settings_service_.GetOwnerKey()->public_key()); |
| 281 EXPECT_FALSE(device_settings_service_.GetOwnerKey()->private_key()); | 281 EXPECT_FALSE(device_settings_service_.GetOwnerKey()->private_key()); |
| 282 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_NONE, | 282 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_NONE, |
| 283 device_settings_service_.GetOwnershipStatus()); | 283 device_settings_service_.GetOwnershipStatus()); |
| 284 EXPECT_FALSE(is_owner_); | 284 EXPECT_FALSE(is_owner_); |
| 285 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_NONE, ownership_status_); | 285 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_NONE, ownership_status_); |
| 286 | 286 |
| 287 owner_key_util_->SetPublicKeyFromPrivateKey(device_policy_.signing_key()); | 287 owner_key_util_->SetPublicKeyFromPrivateKey(device_policy_.signing_key()); |
| 288 ReloadDeviceSettings(); | 288 ReloadDeviceSettings(); |
| 289 device_settings_service_.GetOwnershipStatusAsync( | 289 device_settings_service_.GetOwnershipStatusAsync( |
| 290 base::Bind(&DeviceSettingsServiceTest::SetOwnershipStatus, | 290 base::Bind(&DeviceSettingsServiceTest::SetOwnershipStatus, |
| 291 base::Unretained(this))); | 291 base::Unretained(this))); |
| 292 FlushDeviceSettings(); | 292 FlushDeviceSettings(); |
| 293 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); | 293 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); |
| 294 ASSERT_TRUE(device_settings_service_.GetOwnerKey()); | 294 ASSERT_TRUE(device_settings_service_.GetOwnerKey().get()); |
| 295 ASSERT_TRUE(device_settings_service_.GetOwnerKey()->public_key()); | 295 ASSERT_TRUE(device_settings_service_.GetOwnerKey()->public_key()); |
| 296 std::vector<uint8> key; | 296 std::vector<uint8> key; |
| 297 ASSERT_TRUE(device_policy_.signing_key()->ExportPublicKey(&key)); | 297 ASSERT_TRUE(device_policy_.signing_key()->ExportPublicKey(&key)); |
| 298 EXPECT_EQ(*device_settings_service_.GetOwnerKey()->public_key(), key); | 298 EXPECT_EQ(*device_settings_service_.GetOwnerKey()->public_key(), key); |
| 299 EXPECT_FALSE(device_settings_service_.GetOwnerKey()->private_key()); | 299 EXPECT_FALSE(device_settings_service_.GetOwnerKey()->private_key()); |
| 300 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, | 300 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, |
| 301 device_settings_service_.GetOwnershipStatus()); | 301 device_settings_service_.GetOwnershipStatus()); |
| 302 EXPECT_FALSE(is_owner_); | 302 EXPECT_FALSE(is_owner_); |
| 303 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, ownership_status_); | 303 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, ownership_status_); |
| 304 | 304 |
| 305 owner_key_util_->SetPrivateKey(device_policy_.signing_key()); | 305 owner_key_util_->SetPrivateKey(device_policy_.signing_key()); |
| 306 device_settings_service_.SetUsername(device_policy_.policy_data().username()); | 306 device_settings_service_.SetUsername(device_policy_.policy_data().username()); |
| 307 device_settings_service_.GetOwnershipStatusAsync( | 307 device_settings_service_.GetOwnershipStatusAsync( |
| 308 base::Bind(&DeviceSettingsServiceTest::SetOwnershipStatus, | 308 base::Bind(&DeviceSettingsServiceTest::SetOwnershipStatus, |
| 309 base::Unretained(this))); | 309 base::Unretained(this))); |
| 310 FlushDeviceSettings(); | 310 FlushDeviceSettings(); |
| 311 EXPECT_TRUE(device_settings_service_.HasPrivateOwnerKey()); | 311 EXPECT_TRUE(device_settings_service_.HasPrivateOwnerKey()); |
| 312 ASSERT_TRUE(device_settings_service_.GetOwnerKey()); | 312 ASSERT_TRUE(device_settings_service_.GetOwnerKey().get()); |
| 313 ASSERT_TRUE(device_settings_service_.GetOwnerKey()->public_key()); | 313 ASSERT_TRUE(device_settings_service_.GetOwnerKey()->public_key()); |
| 314 ASSERT_TRUE(device_policy_.signing_key()->ExportPublicKey(&key)); | 314 ASSERT_TRUE(device_policy_.signing_key()->ExportPublicKey(&key)); |
| 315 EXPECT_EQ(*device_settings_service_.GetOwnerKey()->public_key(), key); | 315 EXPECT_EQ(*device_settings_service_.GetOwnerKey()->public_key(), key); |
| 316 EXPECT_TRUE(device_settings_service_.GetOwnerKey()->private_key()); | 316 EXPECT_TRUE(device_settings_service_.GetOwnerKey()->private_key()); |
| 317 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, | 317 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, |
| 318 device_settings_service_.GetOwnershipStatus()); | 318 device_settings_service_.GetOwnershipStatus()); |
| 319 EXPECT_TRUE(is_owner_); | 319 EXPECT_TRUE(is_owner_); |
| 320 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, ownership_status_); | 320 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, ownership_status_); |
| 321 } | 321 } |
| 322 | 322 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 345 EXPECT_CALL(observer_, OwnershipStatusChanged()).Times(0); | 345 EXPECT_CALL(observer_, OwnershipStatusChanged()).Times(0); |
| 346 EXPECT_CALL(observer_, DeviceSettingsUpdated()).Times(1); | 346 EXPECT_CALL(observer_, DeviceSettingsUpdated()).Times(1); |
| 347 device_settings_service_.PropertyChangeComplete(true); | 347 device_settings_service_.PropertyChangeComplete(true); |
| 348 FlushDeviceSettings(); | 348 FlushDeviceSettings(); |
| 349 Mock::VerifyAndClearExpectations(&observer_); | 349 Mock::VerifyAndClearExpectations(&observer_); |
| 350 | 350 |
| 351 device_settings_service_.RemoveObserver(&observer_); | 351 device_settings_service_.RemoveObserver(&observer_); |
| 352 } | 352 } |
| 353 | 353 |
| 354 } // namespace chromeos | 354 } // namespace chromeos |
| OLD | NEW |