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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/profiles/profile_manager_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/settings/device_settings_test_helper.h ('K') | « chrome/browser/extensions/test_extension_system.cc ('k') | chrome/test/base/testing_browser_process.cc » ('j') | chromeos/dbus/dbus_thread_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_manager_unittest.cc
diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc
index 7dd3c1f86d505e8453e338943658de3922d0d271..f92a20f8908a0e582150d5fa3dc8510af01d86dd 100644
--- a/chrome/browser/profiles/profile_manager_unittest.cc
+++ b/chrome/browser/profiles/profile_manager_unittest.cc
@@ -14,6 +14,7 @@
#include "build/build_config.h"
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/extensions/event_router_forwarder.h"
#include "chrome/browser/history/history_service.h"
#include "chrome/browser/history/history_service_factory.h"
@@ -123,6 +124,7 @@ class ProfileManagerTest : public testing::Test {
// before io_thread_ which requires CrosLibrary to be initialized to construct
// its data member pref_proxy_config_tracker_ on ChromeOS.
chromeos::ScopedStubCrosEnabler stub_cros_enabler_;
+ chromeos::ScopedTestCrosSettings test_cros_settings_;
#endif
// The path to temporary directory used to contain the test operations.
« chrome/browser/chromeos/settings/device_settings_test_helper.h ('K') | « chrome/browser/extensions/test_extension_system.cc ('k') | chrome/test/base/testing_browser_process.cc » ('j') | chromeos/dbus/dbus_thread_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698