chrome/browser/chromeos/policy/device_status_collector_browsertest.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_status_collector_browsertest.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_local_account_policy_service_unittest.cc ('k') | chrome/browser/chromeos/proxy_config_service_impl_unittest.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_status_collector_browsertest.cc

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

index 3634257ab754e8314c39d44d4e5529db1c572c25..f2306326f84c4c11ae6338e4d8336664abe3f3d7 100644

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

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

@@ -233,11 +233,12 @@ class DeviceStatusCollectorTest : public testing::Test {

TestingPrefServiceSimple prefs_;

chromeos::system::MockStatisticsProvider statistics_provider_;

- scoped_ptr<TestingDeviceStatusCollector> status_collector_;

- em::DeviceStatusReportRequest status_;

+ chromeos::ScopedTestCrosSettings test_cros_settings_;

chromeos::CrosSettings* cros_settings_;

chromeos::CrosSettingsProvider* device_settings_provider_;

chromeos::StubCrosSettingsProvider stub_settings_provider_;

+ em::DeviceStatusReportRequest status_;

+ scoped_ptr<TestingDeviceStatusCollector> status_collector_;

};

TEST_F(DeviceStatusCollectorTest, AllIdle) {