Make CrosSettings and DeviceSettingsService non Lazy instances

chrome/browser/extensions/test_extension_system.cc

Index: chrome/browser/extensions/test_extension_system.cc
diff --git a/chrome/browser/extensions/test_extension_system.cc b/chrome/browser/extensions/test_extension_system.cc
index 4efca4fc2086849f68ec9bc727051a21e040fce2..b5919d4575e204700a2b0e5f07c9520a51931920 100644
--- a/chrome/browser/extensions/test_extension_system.cc
+++ b/chrome/browser/extensions/test_extension_system.cc
@@ -26,6 +26,10 @@
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/settings/cros_settings.h"
+#endif
+
 using content::BrowserThread;
 
 namespace extensions {
@@ -33,6 +37,13 @@ namespace extensions {
 TestExtensionSystem::TestExtensionSystem(Profile* profile)
     : profile_(profile),
       info_map_(new ExtensionInfoMap()) {
+#if defined OS_CHROMEOS
+  // TestExtensionSystem may or may not be created within
+  // TestExtensionEnvironment, so only create a ScopedTestCrosSettings instance
+  // if none has been created.
+  if (!chromeos::CrosSettings::IsInitialized())
+    test_cros_settings_.reset(new chromeos::ScopedTestCrosSettings);
+#endif
 }
 
 TestExtensionSystem::~TestExtensionSystem() {