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

Unified Diff: chrome/browser/extensions/test_extension_environment.h

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/extensions/test_extension_environment.h
diff --git a/chrome/browser/extensions/test_extension_environment.h b/chrome/browser/extensions/test_extension_environment.h
index 652ce10f19e9176b5c7a74384649704ac7f7efeb..3dd5106ea2274f0cee69b5b634daa2ddb8f9a6af 100644
--- a/chrome/browser/extensions/test_extension_environment.h
+++ b/chrome/browser/extensions/test_extension_environment.h
@@ -13,6 +13,10 @@
#include "ui/base/win/scoped_ole_initializer.h"
#endif
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/settings/cros_settings.h"
+#endif
+
class ExtensionService;
class TestingProfile;
@@ -60,6 +64,11 @@ class TestExtensionEnvironment {
// likely to be indicated by memory leaks in which the object was
// expected to be freed by a DeleteSoon() call.
+#if defined(OS_CHROMEOS)
+ // ExtensionService depends on UserManager which depends on CrosSettings.
+ chromeos::ScopedTestCrosSettings test_cros_settings_;
+#endif
+
#if defined(OS_WIN)
ui::ScopedOleInitializer ole_initializer_;
#endif
« no previous file with comments | « chrome/browser/extensions/extension_service_unittest.h ('k') | chrome/browser/extensions/test_extension_system.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698