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..46c65fde74f76bd34f5cc83174f703417a07c642 100644
--- a/chrome/browser/extensions/test_extension_system.h
+++ b/chrome/browser/extensions/test_extension_system.h
@@ -15,6 +15,12 @@ class FilePath;
 class Time;
 }
 
+#if defined(OS_CHROMEOS)
+namespace chromeos {
+class ScopedTestCrosSettings;
+}
+#endif
+
 namespace extensions {
 
 // Test ExtensionSystem, for use with TestingProfile.
@@ -87,6 +93,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