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

Unified Diff: chrome/test/base/testing_profile.cc

Issue 2849823003: ChromeOS: implement per-user time zone preferences. (Closed)
Patch Set: Try remove g_browser_process check Created 3 years, 7 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/test/base/testing_profile.cc
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
index c43d29fdee2dbfb04d59119c832b39124fcdedb7..1e3948f41a00160ee2c21290073f00e4a180bb50 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -426,6 +426,14 @@ void TestingProfile::Init() {
content::BrowserThread::UI) ||
content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+#if defined(OS_CHROMEOS)
+ if (!chromeos::DeviceSettingsService::IsInitialized())
+ test_device_settings_.reset(new chromeos::ScopedTestDeviceSettingsService);
+
+ if (!chromeos::CrosSettings::IsInitialized())
+ test_cros_settings_.reset(new chromeos::ScopedTestCrosSettings);
+#endif
+
set_is_guest_profile(guest_session_);
BrowserContext::Initialize(this, profile_path_);

Powered by Google App Engine
This is Rietveld 408576698