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

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

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.h
diff --git a/chrome/test/base/testing_profile.h b/chrome/test/base/testing_profile.h
index 5d9bd8a748a41176273dafb16a9e0dea4476b96a..ba7875475419e98606600bf7473a5a40acd34984 100644
--- a/chrome/test/base/testing_profile.h
+++ b/chrome/test/base/testing_profile.h
@@ -19,6 +19,11 @@
#include "components/keyed_service/content/browser_context_keyed_service_factory.h"
#include "extensions/features/features.h"
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/settings/cros_settings.h"
+#include "chrome/browser/chromeos/settings/device_settings_service.h"
+#endif
+
class BrowserContextDependencyManager;
class ExtensionSpecialStoragePolicy;
class HostContentSettingsMap;
@@ -430,6 +435,12 @@ class TestingProfile : public Profile {
std::string profile_name_;
+#if defined(OS_CHROMEOS)
+ std::unique_ptr<chromeos::ScopedTestDeviceSettingsService>
+ test_device_settings_;
+ std::unique_ptr<chromeos::ScopedTestCrosSettings> test_cros_settings_;
+#endif // defined(OS_CHROMEOS)
+
std::unique_ptr<policy::PolicyService> policy_service_;
};

Powered by Google App Engine
This is Rietveld 408576698