diff options
| author | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-23 17:21:42 +0000 |
|---|---|---|
| committer | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-23 17:21:42 +0000 |
| commit | 363f5272cc19dc56e7711d1ef0c3a0c0d52072ca (patch) | |
| tree | a4361820bcd5d36e014fd595eb1c2de0d3825aac /chrome/browser/extensions/test_extension_environment.h | |
| parent | 693ed9d8099c907890474e0ce5728ce1aa0906b1 (diff) | |
| download | chromium_src-363f5272cc19dc56e7711d1ef0c3a0c0d52072ca.zip chromium_src-363f5272cc19dc56e7711d1ef0c3a0c0d52072ca.tar.gz chromium_src-363f5272cc19dc56e7711d1ef0c3a0c0d52072ca.tar.bz2 | |
Revert 195811 "Explicitly construct/destruct UserManager and dep..."
> Explicitly construct/destruct UserManager and dependencies in tests
>
> The ScopedTestUserManager initializes and subsequently tears down the
> UserManager singleton only if it has not been initialized already. This
> allows ScopedTestUserManagers to be nested but also means that it is
> never clear which ScopedTestUserManager actually did end up initializing
> the singleton. The same goes for ScopedTestCrosSettings.
>
> This CL makes the initialization and teardown explicit. The helper classes
> now explicitly manage the initialization and teardown of their respective
> singletons and cannot be nested anymore.
>
> BUG=None
>
> For tests that need to instantiate a UserManager:
> TBR=sky,rkc,aa,thestig,asvitkine,davemoore,kinuko,pkotwicz,davemoore,akalin
>
> Review URL: https://codereview.chromium.org/14192040
TBR=bartfab@google.com
Review URL: https://codereview.chromium.org/14436007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195821 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/test_extension_environment.h')
| -rw-r--r-- | chrome/browser/extensions/test_extension_environment.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/extensions/test_extension_environment.h b/chrome/browser/extensions/test_extension_environment.h index 652ce10..923cb47 100644 --- a/chrome/browser/extensions/test_extension_environment.h +++ b/chrome/browser/extensions/test_extension_environment.h @@ -9,6 +9,10 @@ #include "base/message_loop.h" #include "content/public/test/test_browser_thread.h" +#if defined(OS_CHROMEOS) +#include "chrome/browser/chromeos/login/user_manager.h" +#endif + #if defined(OS_WIN) #include "ui/base/win/scoped_ole_initializer.h" #endif @@ -60,6 +64,10 @@ class TestExtensionEnvironment { // likely to be indicated by memory leaks in which the object was // expected to be freed by a DeleteSoon() call. +#if defined(OS_CHROMEOS) + chromeos::ScopedTestUserManager test_user_manager_; +#endif + #if defined(OS_WIN) ui::ScopedOleInitializer ole_initializer_; #endif |