chrome/browser/chromeos/settings/device_settings_service_unittest.cc - Issue 10885015: Implement new-style CloudPolicyStore for Chrome OS device policy.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/settings/device_settings_service_unittest.cc

Issue 10885015: Implement new-style CloudPolicyStore for Chrome OS device policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 4 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

« chrome/browser/chromeos/settings/device_settings_service.h ('K') | « chrome/browser/chromeos/settings/device_settings_service.cc ('k') | chrome/browser/chromeos/settings/session_manager_operation.h » ('j') | chrome/browser/chromeos/settings/session_manager_operation.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/settings/device_settings_service_unittest.cc

diff --git a/chrome/browser/chromeos/settings/device_settings_service_unittest.cc b/chrome/browser/chromeos/settings/device_settings_service_unittest.cc

index 674142e33fb1ef82481683e9daf463a4ad55f8a4..37c580da9eaacd33f891bccb237032e104ecc8fe 100644

--- a/chrome/browser/chromeos/settings/device_settings_service_unittest.cc

+++ b/chrome/browser/chromeos/settings/device_settings_service_unittest.cc

@@ -233,7 +233,7 @@ TEST_F(DeviceSettingsServiceTest, StoreFailure) {

device_settings_test_helper_.set_store_result(false);

device_settings_service_.Store(

- policy_.GetBlob(),

+ policy_.GetCopy(),

base::Bind(&DeviceSettingsServiceTest::SetOperationCompleted,

base::Unretained(this)));

device_settings_test_helper_.Flush();

@@ -251,7 +251,7 @@ TEST_F(DeviceSettingsServiceTest, StoreSuccess) {

owner_key_util_->SetPublicKeyFromPrivateKey(policy_.signing_key());

device_settings_service_.Store(

- policy_.GetBlob(),

+ policy_.GetCopy(),

base::Bind(&DeviceSettingsServiceTest::SetOperationCompleted,

base::Unretained(this)));

device_settings_test_helper_.Flush();

@@ -272,7 +272,7 @@ TEST_F(DeviceSettingsServiceTest, StoreRotation) {

set_device_policy_refresh_rate(300);

policy_.set_new_signing_key(policy::PolicyBuilder::CreateTestNewSigningKey());

policy_.Build();

- device_settings_service_.Store(policy_.GetBlob(), base::Closure());

+ device_settings_service_.Store(policy_.GetCopy(), base::Closure());

device_settings_test_helper_.FlushStore();

owner_key_util_->SetPublicKeyFromPrivateKey(policy_.new_signing_key());

device_settings_service_.OwnerKeySet(true);

@@ -362,7 +362,7 @@ TEST_F(DeviceSettingsServiceTest, Observer) {

EXPECT_CALL(observer_, OwnershipStatusChanged()).Times(0);

EXPECT_CALL(observer_, DeviceSettingsUpdated()).Times(1);

- device_settings_service_.Store(policy_.GetBlob(), base::Closure());

+ device_settings_service_.Store(policy_.GetCopy(), base::Closure());

device_settings_test_helper_.Flush();

Mock::VerifyAndClearExpectations(&observer_);