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

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

Issue 738843002: Call to CrosSettings::Set() is replaced by OwnerSettingsService::Set() in VersionUpdaterCros. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes. Created 6 years, 1 month 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 (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 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 owner_key_util_->Clear(); 407 owner_key_util_->Clear();
408 408
409 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); 409 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey());
410 EXPECT_FALSE(device_settings_service_.GetPublicKey().get()); 410 EXPECT_FALSE(device_settings_service_.GetPublicKey().get());
411 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_UNKNOWN, 411 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_UNKNOWN,
412 device_settings_service_.GetOwnershipStatus()); 412 device_settings_service_.GetOwnershipStatus());
413 413
414 const std::string& user_id = device_policy_.policy_data().username(); 414 const std::string& user_id = device_policy_.policy_data().username();
415 InitOwner(user_id, false); 415 InitOwner(user_id, false);
416 OwnerSettingsServiceChromeOS* service = 416 OwnerSettingsServiceChromeOS* service =
417 OwnerSettingsServiceChromeOSFactory::GetForProfile(profile_.get()); 417 OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(profile_.get());
418 ASSERT_TRUE(service); 418 ASSERT_TRUE(service);
419 service->IsOwnerAsync(base::Bind(&DeviceSettingsServiceTest::OnIsOwner, 419 service->IsOwnerAsync(base::Bind(&DeviceSettingsServiceTest::OnIsOwner,
420 base::Unretained(this))); 420 base::Unretained(this)));
421 421
422 owner_key_util_->SetPublicKeyFromPrivateKey(*device_policy_.GetSigningKey()); 422 owner_key_util_->SetPublicKeyFromPrivateKey(*device_policy_.GetSigningKey());
423 ReloadDeviceSettings(); 423 ReloadDeviceSettings();
424 424
425 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); 425 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey());
426 ASSERT_TRUE(device_settings_service_.GetPublicKey().get()); 426 ASSERT_TRUE(device_settings_service_.GetPublicKey().get());
427 ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded()); 427 ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded());
(...skipping 24 matching lines...) Expand all
452 452
453 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); 453 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey());
454 EXPECT_FALSE(device_settings_service_.GetPublicKey().get()); 454 EXPECT_FALSE(device_settings_service_.GetPublicKey().get());
455 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_UNKNOWN, 455 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_UNKNOWN,
456 device_settings_service_.GetOwnershipStatus()); 456 device_settings_service_.GetOwnershipStatus());
457 457
458 const std::string& user_id = device_policy_.policy_data().username(); 458 const std::string& user_id = device_policy_.policy_data().username();
459 owner_key_util_->SetPublicKeyFromPrivateKey(*device_policy_.GetSigningKey()); 459 owner_key_util_->SetPublicKeyFromPrivateKey(*device_policy_.GetSigningKey());
460 InitOwner(user_id, false); 460 InitOwner(user_id, false);
461 OwnerSettingsServiceChromeOS* service = 461 OwnerSettingsServiceChromeOS* service =
462 OwnerSettingsServiceChromeOSFactory::GetForProfile(profile_.get()); 462 OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(profile_.get());
463 ASSERT_TRUE(service); 463 ASSERT_TRUE(service);
464 ReloadDeviceSettings(); 464 ReloadDeviceSettings();
465 465
466 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); 466 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey());
467 ASSERT_TRUE(device_settings_service_.GetPublicKey().get()); 467 ASSERT_TRUE(device_settings_service_.GetPublicKey().get());
468 ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded()); 468 ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded());
469 std::vector<uint8> key; 469 std::vector<uint8> key;
470 ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key)); 470 ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key));
471 EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key); 471 EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key);
472 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, 472 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN,
(...skipping 15 matching lines...) Expand all
488 488
489 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); 489 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey());
490 EXPECT_FALSE(device_settings_service_.GetPublicKey().get()); 490 EXPECT_FALSE(device_settings_service_.GetPublicKey().get());
491 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_UNKNOWN, 491 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_UNKNOWN,
492 device_settings_service_.GetOwnershipStatus()); 492 device_settings_service_.GetOwnershipStatus());
493 493
494 const std::string& user_id = device_policy_.policy_data().username(); 494 const std::string& user_id = device_policy_.policy_data().username();
495 owner_key_util_->SetPublicKeyFromPrivateKey(*device_policy_.GetSigningKey()); 495 owner_key_util_->SetPublicKeyFromPrivateKey(*device_policy_.GetSigningKey());
496 InitOwner(user_id, false); 496 InitOwner(user_id, false);
497 OwnerSettingsServiceChromeOS* service = 497 OwnerSettingsServiceChromeOS* service =
498 OwnerSettingsServiceChromeOSFactory::GetForProfile(profile_.get()); 498 OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(profile_.get());
499 ASSERT_TRUE(service); 499 ASSERT_TRUE(service);
500 service->IsOwnerAsync(base::Bind(&DeviceSettingsServiceTest::OnIsOwner, 500 service->IsOwnerAsync(base::Bind(&DeviceSettingsServiceTest::OnIsOwner,
501 base::Unretained(this))); 501 base::Unretained(this)));
502 ReloadDeviceSettings(); 502 ReloadDeviceSettings();
503 503
504 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); 504 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey());
505 ASSERT_TRUE(device_settings_service_.GetPublicKey().get()); 505 ASSERT_TRUE(device_settings_service_.GetPublicKey().get());
506 ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded()); 506 ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded());
507 std::vector<uint8> key; 507 std::vector<uint8> key;
508 ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key)); 508 ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key));
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 ASSERT_TRUE(device_settings_service_.GetPublicKey().get()); 545 ASSERT_TRUE(device_settings_service_.GetPublicKey().get());
546 ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded()); 546 ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded());
547 std::vector<uint8> key; 547 std::vector<uint8> key;
548 ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key)); 548 ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key));
549 EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key); 549 EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key);
550 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, 550 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN,
551 device_settings_service_.GetOwnershipStatus()); 551 device_settings_service_.GetOwnershipStatus());
552 EXPECT_FALSE(is_owner_set_); 552 EXPECT_FALSE(is_owner_set_);
553 553
554 OwnerSettingsServiceChromeOS* service = 554 OwnerSettingsServiceChromeOS* service =
555 OwnerSettingsServiceChromeOSFactory::GetForProfile(profile_.get()); 555 OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(profile_.get());
556 ASSERT_TRUE(service); 556 ASSERT_TRUE(service);
557 service->IsOwnerAsync(base::Bind(&DeviceSettingsServiceTest::OnIsOwner, 557 service->IsOwnerAsync(base::Bind(&DeviceSettingsServiceTest::OnIsOwner,
558 base::Unretained(this))); 558 base::Unretained(this)));
559 // The callback should be called immediately. 559 // The callback should be called immediately.
560 base::MessageLoop::current()->RunUntilIdle(); 560 base::MessageLoop::current()->RunUntilIdle();
561 561
562 EXPECT_TRUE(device_settings_service_.HasPrivateOwnerKey()); 562 EXPECT_TRUE(device_settings_service_.HasPrivateOwnerKey());
563 ASSERT_TRUE(device_settings_service_.GetPublicKey().get()); 563 ASSERT_TRUE(device_settings_service_.GetPublicKey().get());
564 ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded()); 564 ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded());
565 ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key)); 565 ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key));
(...skipping 30 matching lines...) Expand all
596 EXPECT_CALL(observer_, OwnershipStatusChanged()).Times(0); 596 EXPECT_CALL(observer_, OwnershipStatusChanged()).Times(0);
597 EXPECT_CALL(observer_, DeviceSettingsUpdated()).Times(1); 597 EXPECT_CALL(observer_, DeviceSettingsUpdated()).Times(1);
598 device_settings_service_.PropertyChangeComplete(true); 598 device_settings_service_.PropertyChangeComplete(true);
599 FlushDeviceSettings(); 599 FlushDeviceSettings();
600 Mock::VerifyAndClearExpectations(&observer_); 600 Mock::VerifyAndClearExpectations(&observer_);
601 601
602 device_settings_service_.RemoveObserver(&observer_); 602 device_settings_service_.RemoveObserver(&observer_);
603 } 603 }
604 604
605 } // namespace chromeos 605 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698