Make CrosSettings and DeviceSettingsService non Lazy instances

chrome/browser/extensions/test_extension_system.h

Index: chrome/browser/extensions/test_extension_system.h
diff --git a/chrome/browser/extensions/test_extension_system.h b/chrome/browser/extensions/test_extension_system.h
index bb845a96d27f7ecbc3c6bfbd2a58ff71e79e4df1..9ef92debfc8a21812df0fba4b3d4db8946c8583d 100644
--- a/chrome/browser/extensions/test_extension_system.h
+++ b/chrome/browser/extensions/test_extension_system.h
@@ -7,6 +7,10 @@
 
 #include "chrome/browser/extensions/extension_system.h"
 
+#if defined OS_CHROMEOS
+#include "chrome/browser/chromeos/settings/cros_settings.h"

[bartfab (slow), 2013/04/17 11:14:10]

Nit: It would be sufficient to forward-declare here and do the include in the
implementation file.

[stevenjb, 2013/04/17 16:27:12]

Done.

+#endif
+
 class CommandLine;
 
 namespace base {
@@ -87,6 +91,10 @@ class TestExtensionSystem : public ExtensionSystem {
   scoped_ptr<AlarmManager> alarm_manager_;
   scoped_refptr<ExtensionInfoMap> info_map_;
   scoped_ptr<ApiResourceManager<Socket> > socket_manager_;
+#if defined OS_CHROMEOS
+  // ExtensionService depends on UserManager which depends on CrosSettings.
+  scoped_ptr<chromeos::ScopedTestCrosSettings> test_cros_settings_;
+#endif
 };
 
 }  // namespace extensions