chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc - Issue 258743005: Enable Enterprise enrollment on desktop builds.

Unified Diff: chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc

Issue 258743005: Enable Enterprise enrollment on desktop builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix linkage visibility of policy protobufs Created 6 years, 8 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 side-by-side diff with in-line comments

Download patch

« base/path_service.h ('K') | « chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.cc ('k') | chrome/browser/chromeos/settings/device_settings_test_helper.h » ('j') | chromeos/dbus/fake_cryptohome_client.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc

diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc

index 7595a4edbbf60ccb6cf6b931b6ca1aeff15a984a..5d1adcef8920bee20b5c343ee11db381cf13aa45 100644

--- a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc

+++ b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc

@@ -145,8 +145,8 @@ class UserCloudPolicyStoreChromeOSTest : public testing::Test {

chromeos::SessionManagerClient::StorePolicyCallback store_callback;

EXPECT_CALL(session_manager_client_,

StorePolicyForUser(PolicyBuilder::kFakeUsername,

- policy_.GetBlob(), _, _))

- .WillOnce(SaveArg<3>(&store_callback));

+ policy_.GetBlob(), _))

+ .WillOnce(SaveArg<2>(&store_callback));

store_->Store(policy_.policy());

RunUntilIdle();

Mock::VerifyAndClearExpectations(&session_manager_client_);

@@ -265,8 +265,8 @@ TEST_F(UserCloudPolicyStoreChromeOSTest, StoreFail) {

chromeos::SessionManagerClient::StorePolicyCallback store_callback;

EXPECT_CALL(session_manager_client_,

StorePolicyForUser(PolicyBuilder::kFakeUsername,

- policy_.GetBlob(), _, _))

- .WillOnce(SaveArg<3>(&store_callback));

+ policy_.GetBlob(), _))

+ .WillOnce(SaveArg<2>(&store_callback));

store_->Store(policy_.policy());

RunUntilIdle();

Mock::VerifyAndClearExpectations(&session_manager_client_);

@@ -290,7 +290,7 @@ TEST_F(UserCloudPolicyStoreChromeOSTest, StoreValidationError) {

ExpectError(CloudPolicyStore::STATUS_VALIDATION_ERROR);

EXPECT_CALL(session_manager_client_,

StorePolicyForUser(PolicyBuilder::kFakeUsername,

- policy_.GetBlob(), _, _))

+ policy_.GetBlob(), _))

.Times(0);

store_->Store(policy_.policy());

RunUntilIdle();

@@ -311,7 +311,7 @@ TEST_F(UserCloudPolicyStoreChromeOSTest, StoreWithoutPolicyKey) {

ExpectError(CloudPolicyStore::STATUS_VALIDATION_ERROR);

EXPECT_CALL(session_manager_client_,

StorePolicyForUser(PolicyBuilder::kFakeUsername,

- policy_.GetBlob(), _, _))

+ policy_.GetBlob(), _))

.Times(0);

store_->Store(policy_.policy());

RunUntilIdle();

@@ -327,7 +327,7 @@ TEST_F(UserCloudPolicyStoreChromeOSTest, StoreWithInvalidSignature) {

ExpectError(CloudPolicyStore::STATUS_VALIDATION_ERROR);

EXPECT_CALL(session_manager_client_,

StorePolicyForUser(PolicyBuilder::kFakeUsername,

- policy_.GetBlob(), _, _))

+ policy_.GetBlob(), _))

.Times(0);

store_->Store(policy_.policy());

RunUntilIdle();