Make CrosSettings and DeviceSettingsService non Lazy instances

chrome/browser/extensions/test_extension_system.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_SYSTEM_H_
 #define CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_SYSTEM_H_
 
 #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 {
 class Clock;
 class FilePath;
 class Time;
 }
 
 namespace extensions {
 
@@ skipping 60 matching lines @@
   scoped_ptr<ShellWindowGeometryCache> shell_window_geometry_cache_;
   scoped_ptr<Blacklist> blacklist_;
   scoped_ptr<StandardManagementPolicyProvider>
       standard_management_policy_provider_;
   scoped_ptr<ManagementPolicy> management_policy_;
   scoped_ptr<ExtensionService> extension_service_;
   scoped_ptr<ExtensionProcessManager> extension_process_manager_;
   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
 
 #endif  // CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_SYSTEM_H_