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

chrome/browser/extensions/active_tab_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
@@ skipping 19 matching lines @@
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_builder.h"
 #include "extensions/common/features/feature.h"
 #include "extensions/common/features/feature_channel.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/value_builder.h"
 
 #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"
 #include "components/signin/core/account_id/account_id.h"
 #include "extensions/browser/extension_dialog_auto_confirm.h"
 #endif
 
 using base::DictionaryValue;
 using base::ListValue;
 using content::BrowserThread;
@@ skipping 390 matching lines @@
 // Test that the platform delegate is being set and the permission is prompted
 // for.
 TEST_F(ActiveTabTest, DelegateIsSet) {
   // Setup, login a public account user.
   chromeos::ScopedTestPublicSessionLoginState login_state;
   std::string user_id = "public@account.user";
   std::string user_email = user_id;
   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);
   user_manager::UserManager::Get()->UserLoggedIn(
       account_id, user_id_hash, true);
 
   GURL google("http://www.google.com");
   NavigateAndCommit(google);
 
   // Grant and verify.
@@ skipping 16 matching lines @@
     base::RunLoop().RunUntilIdle();
     EXPECT_TRUE(IsBlocked(another_extension, google));
     active_tab_permission_granter()->GrantIfRequested(another_extension.get());
     base::RunLoop().RunUntilIdle();
     EXPECT_TRUE(IsBlocked(another_extension, google));
   }
 
   // Cleanup.
   chromeos::WallpaperManager::Shutdown();
   delete ActiveTabPermissionGranter::SetPlatformDelegate(nullptr);
-  chromeos::ChromeUserManager::Get()->Shutdown();
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace
 }  // namespace extensions