Revert of ChromeOS: Per-user time zone: refactor tests first.

chrome/browser/extensions/active_tab_unittest.cc

Index: chrome/browser/extensions/active_tab_unittest.cc
diff --git a/chrome/browser/extensions/active_tab_unittest.cc b/chrome/browser/extensions/active_tab_unittest.cc
index 46f4d9157637a74d0638f1b48f102be4835a696e..5b732a5d4b30378277d64d6658e51a87ca608bdf 100644
--- a/chrome/browser/extensions/active_tab_unittest.cc
+++ b/chrome/browser/extensions/active_tab_unittest.cc
@@ -37,8 +37,10 @@
 #if defined(OS_CHROMEOS)
 #include "base/run_loop.h"
 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
+#include "chrome/browser/chromeos/login/users/scoped_test_user_manager.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
+#include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/test/base/scoped_testing_local_state.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chromeos/login/scoped_test_public_session_login_state.h"
@@ -449,7 +451,10 @@
   AccountId account_id = AccountId::FromUserEmailGaiaId(user_email, user_id);
   std::string user_id_hash = chromeos::ProfileHelper::Get()->
       GetUserIdHashByUserIdForTesting(user_id);
+  chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
+  chromeos::ScopedTestCrosSettings test_cros_settings_;
   ScopedTestingLocalState local_state(TestingBrowserProcess::GetGlobal());
+  chromeos::ScopedTestUserManager test_user_manager_;
   chromeos::WallpaperManager::Initialize();
   g_browser_process->local_state()->SetString(
       "PublicAccountPendingDataRemoval", user_email);
@@ -486,7 +491,6 @@
   // Cleanup.
   chromeos::WallpaperManager::Shutdown();
   delete ActiveTabPermissionGranter::SetPlatformDelegate(nullptr);
-  chromeos::ChromeUserManager::Get()->Shutdown();
 }
 #endif  // defined(OS_CHROMEOS)