Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4903)

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: Rebase 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
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) {

Powered by Google App Engine
This is Rietveld 408576698