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/profiles/profile_manager_unittest.cc | |
| 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/profiles/profile_manager_unittest.cc')
| -rw-r--r-- | chrome/browser/profiles/profile_manager_unittest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc index 0b3bccb..3fda3f9 100644 --- a/chrome/browser/profiles/profile_manager_unittest.cc +++ b/chrome/browser/profiles/profile_manager_unittest.cc @@ -14,6 +14,7 @@ #include "build/build_config.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/browser_process.h" +#include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/extensions/event_router_forwarder.h" #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" @@ -41,6 +42,7 @@ #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/login/mock_user_manager.h" #include "chrome/browser/chromeos/login/user_manager.h" +#include "chrome/browser/chromeos/settings/cros_settings.h" #include "chromeos/chromeos_switches.h" #endif @@ -125,7 +127,7 @@ class ProfileManagerTest : public testing::Test { // before io_thread_ which requires CrosLibrary to be initialized to construct // its data member pref_proxy_config_tracker_ on ChromeOS. chromeos::ScopedStubCrosEnabler stub_cros_enabler_; - chromeos::ScopedTestUserManager test_user_manager_; + chromeos::ScopedTestCrosSettings test_cros_settings_; #endif // The path to temporary directory used to contain the test operations. @@ -140,6 +142,10 @@ class ProfileManagerTest : public testing::Test { content::TestBrowserThread file_thread_; // IOThread is necessary for the creation of some services below. IOThread io_thread_; + +#if defined(OS_CHROMEOS) + chromeos::ScopedTestUserManager test_user_manager_; +#endif }; TEST_F(ProfileManagerTest, GetProfile) { |