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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 567553002: TPMTokenLoader: Report both the disabled and enabled state of the TPM. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nss_util_deadcode
Patch Set: Addressed nit. Created 6 years, 3 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
« no previous file with comments | « chrome/browser/chromeos/ownership/owner_settings_service.cc ('k') | chrome/browser/chromeos/settings/device_settings_test_helper.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); 509 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey());
510 ASSERT_TRUE(device_settings_service_.GetPublicKey().get()); 510 ASSERT_TRUE(device_settings_service_.GetPublicKey().get());
511 ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded()); 511 ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded());
512 std::vector<uint8> key; 512 std::vector<uint8> key;
513 ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key)); 513 ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key));
514 EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key); 514 EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key);
515 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, 515 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN,
516 device_settings_service_.GetOwnershipStatus()); 516 device_settings_service_.GetOwnershipStatus());
517 EXPECT_FALSE(is_owner_set_); 517 EXPECT_FALSE(is_owner_set_);
518 518
519 service->OnTPMTokenReady(); 519 service->OnTPMTokenReady(true /* is ready */);
520 FlushDeviceSettings(); 520 FlushDeviceSettings();
521 521
522 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); 522 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey());
523 ASSERT_TRUE(device_settings_service_.GetPublicKey().get()); 523 ASSERT_TRUE(device_settings_service_.GetPublicKey().get());
524 ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded()); 524 ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded());
525 ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key)); 525 ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key));
526 EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key); 526 EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key);
527 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); 527 EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey());
528 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, 528 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN,
529 device_settings_service_.GetOwnershipStatus()); 529 device_settings_service_.GetOwnershipStatus());
(...skipping 23 matching lines...) Expand all
553 ASSERT_TRUE(device_settings_service_.GetPublicKey().get()); 553 ASSERT_TRUE(device_settings_service_.GetPublicKey().get());
554 ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded()); 554 ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded());
555 std::vector<uint8> key; 555 std::vector<uint8> key;
556 ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key)); 556 ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key));
557 EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key); 557 EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key);
558 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, 558 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN,
559 device_settings_service_.GetOwnershipStatus()); 559 device_settings_service_.GetOwnershipStatus());
560 EXPECT_FALSE(is_owner_set_); 560 EXPECT_FALSE(is_owner_set_);
561 561
562 owner_key_util_->SetPrivateKey(device_policy_.GetSigningKey()); 562 owner_key_util_->SetPrivateKey(device_policy_.GetSigningKey());
563 service->OnTPMTokenReady(); 563 service->OnTPMTokenReady(true /* is ready */);
564 FlushDeviceSettings(); 564 FlushDeviceSettings();
565 565
566 EXPECT_TRUE(device_settings_service_.HasPrivateOwnerKey()); 566 EXPECT_TRUE(device_settings_service_.HasPrivateOwnerKey());
567 ASSERT_TRUE(device_settings_service_.GetPublicKey().get()); 567 ASSERT_TRUE(device_settings_service_.GetPublicKey().get());
568 ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded()); 568 ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded());
569 ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key)); 569 ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key));
570 EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key); 570 EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key);
571 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, 571 EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN,
572 device_settings_service_.GetOwnershipStatus()); 572 device_settings_service_.GetOwnershipStatus());
573 EXPECT_TRUE(is_owner_set_); 573 EXPECT_TRUE(is_owner_set_);
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 EXPECT_CALL(observer_, OwnershipStatusChanged()).Times(0); 644 EXPECT_CALL(observer_, OwnershipStatusChanged()).Times(0);
645 EXPECT_CALL(observer_, DeviceSettingsUpdated()).Times(1); 645 EXPECT_CALL(observer_, DeviceSettingsUpdated()).Times(1);
646 device_settings_service_.PropertyChangeComplete(true); 646 device_settings_service_.PropertyChangeComplete(true);
647 FlushDeviceSettings(); 647 FlushDeviceSettings();
648 Mock::VerifyAndClearExpectations(&observer_); 648 Mock::VerifyAndClearExpectations(&observer_);
649 649
650 device_settings_service_.RemoveObserver(&observer_); 650 device_settings_service_.RemoveObserver(&observer_);
651 } 651 }
652 652
653 } // namespace chromeos 653 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/ownership/owner_settings_service.cc ('k') | chrome/browser/chromeos/settings/device_settings_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698