| Index: chrome/browser/chromeos/settings/session_manager_operation_unittest.cc
|
| diff --git a/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc b/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc
|
| index 25f98d751d225c31cecbfe8a6c5d87d452e0b83c..feb5da734bc83064e31fd9f8779c1e3e22f07b38 100644
|
| --- a/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc
|
| +++ b/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc
|
| @@ -223,65 +223,4 @@ TEST_F(SessionManagerOperationTest, StoreSettings) {
|
| op.device_settings()->SerializeAsString());
|
| }
|
|
|
| -TEST_F(SessionManagerOperationTest, SignAndStoreSettings) {
|
| - owner_key_util_->SetPrivateKey(policy_.GetSigningKey());
|
| - service_->OnTPMTokenReady(true /* is ready */);
|
| -
|
| - scoped_ptr<em::PolicyData> policy(new em::PolicyData(policy_.policy_data()));
|
| - SignAndStoreSettingsOperation op(
|
| - base::Bind(&SessionManagerOperationTest::OnOperationCompleted,
|
| - base::Unretained(this)),
|
| - policy.Pass());
|
| - op.set_owner_settings_service(service_->as_weak_ptr());
|
| -
|
| - EXPECT_CALL(*this,
|
| - OnOperationCompleted(
|
| - &op, DeviceSettingsService::STORE_SUCCESS));
|
| - op.Start(&device_settings_test_helper_, owner_key_util_, NULL);
|
| - device_settings_test_helper_.Flush();
|
| - Mock::VerifyAndClearExpectations(this);
|
| -
|
| - // The blob should validate.
|
| - scoped_ptr<em::PolicyFetchResponse> policy_response(
|
| - new em::PolicyFetchResponse());
|
| - ASSERT_TRUE(
|
| - policy_response->ParseFromString(
|
| - device_settings_test_helper_.policy_blob()));
|
| - policy::DeviceCloudPolicyValidator* validator =
|
| - policy::DeviceCloudPolicyValidator::Create(
|
| - policy_response.Pass(), message_loop_.message_loop_proxy());
|
| - validator->ValidateUsername(policy_.policy_data().username(), true);
|
| - const base::Time expected_time = base::Time::UnixEpoch() +
|
| - base::TimeDelta::FromMilliseconds(policy::PolicyBuilder::kFakeTimestamp);
|
| - validator->ValidateTimestamp(
|
| - expected_time,
|
| - expected_time,
|
| - policy::CloudPolicyValidatorBase::TIMESTAMP_REQUIRED);
|
| - validator->ValidatePolicyType(policy::dm_protocol::kChromeDevicePolicyType);
|
| - validator->ValidatePayload();
|
| - std::vector<uint8> public_key;
|
| - policy_.GetSigningKey()->ExportPublicKey(&public_key);
|
| - // Convert from bytes to string format (which is what ValidateSignature()
|
| - // takes).
|
| - std::string public_key_as_string = std::string(
|
| - reinterpret_cast<const char*>(vector_as_array(&public_key)),
|
| - public_key.size());
|
| - validator->ValidateSignature(
|
| - public_key_as_string,
|
| - policy::GetPolicyVerificationKey(),
|
| - policy::PolicyBuilder::kFakeDomain,
|
| - false);
|
| - validator->StartValidation(
|
| - base::Bind(&SessionManagerOperationTest::CheckSuccessfulValidation,
|
| - base::Unretained(this)));
|
| -
|
| - message_loop_.RunUntilIdle();
|
| - EXPECT_TRUE(validated_);
|
| -
|
| - // Loaded device settings should match what the operation received.
|
| - ASSERT_TRUE(op.device_settings().get());
|
| - EXPECT_EQ(policy_.payload().SerializeAsString(),
|
| - op.device_settings()->SerializeAsString());
|
| -}
|
| -
|
| } // namespace chromeos
|
|
|