From 363f5272cc19dc56e7711d1ef0c3a0c0d52072ca Mon Sep 17 00:00:00 2001 From: "kalman@chromium.org" Date: Tue, 23 Apr 2013 17:21:42 +0000 Subject: 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 --- chrome/browser/browser_commands_unittest.cc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'chrome/browser/browser_commands_unittest.cc') diff --git a/chrome/browser/browser_commands_unittest.cc b/chrome/browser/browser_commands_unittest.cc index 9d5cc10..8ee05a6 100644 --- a/chrome/browser/browser_commands_unittest.cc +++ b/chrome/browser/browser_commands_unittest.cc @@ -17,6 +17,10 @@ #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" +#if defined(OS_CHROMEOS) +#include "chrome/browser/chromeos/login/mock_user_manager.h" +#endif + typedef BrowserWithTestWindowTest BrowserCommandsTest; using content::OpenURLParams; -- cgit v1.1