diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 19:24:23 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 19:24:23 +0000 |
| commit | 7fe9310614a906818a218c4c20e29930cbae104f (patch) | |
| tree | aef8a684830a9fda296b9f589a5eba66afcc328b /chrome/browser/extensions/test_extension_system.cc | |
| parent | 09a8d917eb7bc6b45277b24a851ccec6e8e499a9 (diff) | |
| download | chromium_src-7fe9310614a906818a218c4c20e29930cbae104f.zip chromium_src-7fe9310614a906818a218c4c20e29930cbae104f.tar.gz chromium_src-7fe9310614a906818a218c4c20e29930cbae104f.tar.bz2 | |
Make CrosSettings and DeviceSettingsService non Lazy instances
BUG=222681
For BrowserProcessImpl change:
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/14200028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194656 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/test_extension_system.cc')
| -rw-r--r-- | chrome/browser/extensions/test_extension_system.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/browser/extensions/test_extension_system.cc b/chrome/browser/extensions/test_extension_system.cc index 4efca4f..b5919d4 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() { |