chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc - Issue 14200028: Make CrosSettings and DeviceSettingsService non Lazy instances

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/policy/device_local_account_policy_service_unittest.cc

Issue 14200028: Make CrosSettings and DeviceSettingsService non Lazy instances (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix LoginUtilsTest Created 7 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

« chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h ('K') | « chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc ('k') | chrome/browser/chromeos/policy/device_status_collector_browsertest.cc » ('j') | chrome/browser/chromeos/settings/cros_settings.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 2976045057dff927a700ac35f936d1f5e1e05b7d..326b7ecbf782feab1df971828527d66ce8e390c5 100644

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

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

@@ -41,7 +41,7 @@ class DeviceLocalAccountPolicyServiceTest

: public chromeos::DeviceSettingsTestBase {

public:

DeviceLocalAccountPolicyServiceTest()

- : service_(&device_settings_test_helper_, &device_settings_service_) {}

+ : service_(&device_settings_test_helper_, device_settings_service_) {}

virtual void SetUp() OVERRIDE {

DeviceSettingsTestBase::SetUp();

@@ -248,7 +248,7 @@ TEST_F(DeviceLocalAccountPolicyServiceTest, DevicePolicyChange) {

device_policy_.payload().mutable_device_local_accounts()->clear_account();

device_policy_.Build();

device_settings_test_helper_.set_policy_blob(device_policy_.GetBlob());

- device_settings_service_.PropertyChangeComplete(true);

+ device_settings_service_->PropertyChangeComplete(true);

FlushDeviceSettings();

EXPECT_FALSE(service_.GetBrokerForAccount(PolicyBuilder::kFakeUsername));

Mock::VerifyAndClearExpectations(&service_observer_);

@@ -270,7 +270,7 @@ TEST_F(DeviceLocalAccountPolicyServiceTest, DuplicateAccounts) {

EXPECT_CALL(service_observer_, OnDeviceLocalAccountsChanged());

EXPECT_CALL(service_observer_, OnPolicyUpdated(PolicyBuilder::kFakeUsername));

- device_settings_service_.PropertyChangeComplete(true);

+ device_settings_service_->PropertyChangeComplete(true);

FlushDeviceSettings();

Mock::VerifyAndClearExpectations(&service_observer_);