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

1 files changed, 0 insertions, 8 deletions

diff --git a/chrome/browser/themes/theme_syncable_service_unittest.cc b/chrome/browser/themes/theme_syncable_service_unittest.cc
index 4b1cac0..8fa7d25 100644
--- a/chrome/browser/themes/theme_syncable_service_unittest.cc
+++ b/chrome/browser/themes/theme_syncable_service_unittest.cc
@@ -27,10 +27,6 @@
 #include "sync/protocol/theme_specifics.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/login/user_manager.h"
-#endif
-
 using std::string;
 
 namespace {
@@ -235,10 +231,6 @@ class ThemeSyncableServiceTest : public testing::Test {
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
 
-#if defined OS_CHROMEOS
-  chromeos::ScopedTestUserManager test_user_manager_;
-#endif
-
   scoped_ptr<TestingProfile> profile_;
   FakeThemeService* fake_theme_service_;
   scoped_refptr<extensions::Extension> theme_extension_;