ScopedUserManagerEnabler -> components/user_manager
Bug: 771698, 780542
Change-Id: I751a646cd04ee62eaf9de34df974c6560b82afbe
Reviewed-on: https://chromium-review.googlesource.com/761716
Reviewed-by: Steven Bennetts <[email protected]>
Reviewed-by: Scott Violet <[email protected]>
Reviewed-by: Hidehiko Abe <[email protected]>
Commit-Queue: Xiyuan Xia <[email protected]>
Cr-Commit-Position: refs/heads/master@{#516065}diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc
index 9da7a7ec..8a7edbb 100644
--- a/chrome/browser/apps/app_browsertest.cc
+++ b/chrome/browser/apps/app_browsertest.cc
@@ -13,6 +13,7 @@
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -64,9 +65,9 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/login/users/mock_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/fake_power_manager_client.h"
+#include "components/user_manager/scoped_user_manager.h"
#endif
using content::WebContents;
@@ -1282,8 +1283,8 @@
PlatformAppBrowserTest::SetUpOnMainThread();
mock_user_manager_ = new chromeos::MockUserManager;
- user_manager_enabler_.reset(
- new chromeos::ScopedUserManagerEnabler(mock_user_manager_));
+ user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
+ base::WrapUnique(mock_user_manager_));
EXPECT_CALL(*mock_user_manager_, IsUserLoggedIn())
.WillRepeatedly(testing::Return(true));
@@ -1310,7 +1311,7 @@
private:
chromeos::FakePowerManagerClient* power_manager_client_;
chromeos::MockUserManager* mock_user_manager_;
- std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
DISALLOW_COPY_AND_ASSIGN(RestartDeviceTest);
};
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
index fb17fa9..791e34f 100644
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
@@ -95,10 +95,10 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/login/users/mock_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/fake_cryptohome_client.h"
#include "components/signin/core/account_id/account_id.h"
+#include "components/user_manager/scoped_user_manager.h"
#endif
#if BUILDFLAG(ENABLE_EXTENSIONS)
@@ -1427,7 +1427,8 @@
new testing::NiceMock<chromeos::MockUserManager>();
mock_user_manager->SetActiveUser(
AccountId::FromUserEmail("[email protected]"));
- chromeos::ScopedUserManagerEnabler user_manager_enabler(mock_user_manager);
+ user_manager::ScopedUserManager user_manager_enabler(
+ base::WrapUnique(mock_user_manager));
// Owned by DBusThreadManager.
FakeCryptohomeClient* cryptohome_client = new FakeCryptohomeClient();
diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn
index fa2c3de..565ffa9 100644
--- a/chrome/browser/chromeos/BUILD.gn
+++ b/chrome/browser/chromeos/BUILD.gn
@@ -1122,8 +1122,6 @@
"login/users/multi_profile_user_controller_delegate.h",
"login/users/scoped_test_user_manager.cc",
"login/users/scoped_test_user_manager.h",
- "login/users/scoped_user_manager_enabler.cc",
- "login/users/scoped_user_manager_enabler.h",
"login/users/supervised_user_manager.h",
"login/users/supervised_user_manager_impl.cc",
"login/users/supervised_user_manager_impl.h",
diff --git a/chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler_unittest.cc b/chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler_unittest.cc
index 6c386ea..6d988ed 100644
--- a/chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler_unittest.cc
+++ b/chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler_unittest.cc
@@ -15,7 +15,6 @@
#include "chrome/browser/chromeos/arc/arc_util.h"
#include "chrome/browser/chromeos/arc/test/arc_data_removed_waiter.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/test/base/testing_profile.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/fake_session_manager_client.h"
@@ -24,6 +23,7 @@
#include "components/arc/arc_util.h"
#include "components/arc/test/fake_arc_session.h"
#include "components/sync_preferences/testing_pref_service_syncable.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -33,7 +33,8 @@
class ArcPlayStoreEnabledPreferenceHandlerTest : public testing::Test {
public:
ArcPlayStoreEnabledPreferenceHandlerTest()
- : user_manager_enabler_(new chromeos::FakeChromeUserManager()) {}
+ : user_manager_enabler_(
+ std::make_unique<chromeos::FakeChromeUserManager>()) {}
void SetUp() override {
chromeos::DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient(
@@ -83,7 +84,7 @@
private:
content::TestBrowserThreadBundle thread_bundle_;
- chromeos::ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
base::ScopedTempDir temp_dir_;
std::unique_ptr<TestingProfile> profile_;
std::unique_ptr<ArcSessionManager> arc_session_manager_;
diff --git a/chrome/browser/chromeos/arc/arc_session_manager_browsertest.cc b/chrome/browser/chromeos/arc/arc_session_manager_browsertest.cc
index 8984d01..7dec446 100644
--- a/chrome/browser/chromeos/arc/arc_session_manager_browsertest.cc
+++ b/chrome/browser/chromeos/arc/arc_session_manager_browsertest.cc
@@ -19,7 +19,6 @@
#include "chrome/browser/chromeos/arc/arc_util.h"
#include "chrome/browser/chromeos/arc/test/arc_data_removed_waiter.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/policy/cloud/test_request_interceptor.h"
@@ -44,6 +43,7 @@
#include "components/prefs/pref_service.h"
#include "components/signin/core/account_id/account_id.h"
#include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "components/user_manager/user_manager.h"
#include "content/public/browser/browser_thread.h"
#include "net/base/upload_bytes_element_reader.h"
@@ -121,8 +121,8 @@
}
void SetUpOnMainThread() override {
- user_manager_enabler_.reset(new chromeos::ScopedUserManagerEnabler(
- new chromeos::FakeChromeUserManager));
+ user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
+ std::make_unique<chromeos::FakeChromeUserManager>());
// Init ArcSessionManager for testing.
ArcServiceLauncher::Get()->ResetForTesting();
ArcSessionManager::DisableUIForTesting();
@@ -208,7 +208,7 @@
private:
std::unique_ptr<policy::LocalPolicyTestServer> test_server_;
- std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
base::ScopedTempDir temp_dir_;
std::unique_ptr<TestingProfile> profile_;
FakeProfileOAuth2TokenService* token_service_;
diff --git a/chrome/browser/chromeos/arc/arc_session_manager_unittest.cc b/chrome/browser/chromeos/arc/arc_session_manager_unittest.cc
index c78c3a6..1f59832 100644
--- a/chrome/browser/chromeos/arc/arc_session_manager_unittest.cc
+++ b/chrome/browser/chromeos/arc/arc_session_manager_unittest.cc
@@ -26,7 +26,6 @@
#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_view_observer.h"
#include "chrome/browser/chromeos/login/ui/login_display_host.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
@@ -53,6 +52,7 @@
#include "components/sync/model/fake_sync_change_processor.h"
#include "components/sync/model/sync_error_factory_mock.h"
#include "components/sync_preferences/testing_pref_service_syncable.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "components/user_manager/user_manager.h"
#include "components/user_manager/user_names.h"
#include "content/public/browser/browser_thread.h"
@@ -157,7 +157,8 @@
public:
ArcSessionManagerTestBase()
: thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
- user_manager_enabler_(new chromeos::FakeChromeUserManager()) {}
+ user_manager_enabler_(
+ std::make_unique<chromeos::FakeChromeUserManager>()) {}
~ArcSessionManagerTestBase() override = default;
void SetUp() override {
@@ -234,7 +235,7 @@
std::unique_ptr<TestingProfile> profile_;
std::unique_ptr<ArcServiceManager> arc_service_manager_;
std::unique_ptr<ArcSessionManager> arc_session_manager_;
- chromeos::ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
base::ScopedTempDir temp_dir_;
DISALLOW_COPY_AND_ASSIGN(ArcSessionManagerTestBase);
diff --git a/chrome/browser/chromeos/arc/arc_support_host_unittest.cc b/chrome/browser/chromeos/arc/arc_support_host_unittest.cc
index aafe680..10932c1e 100644
--- a/chrome/browser/chromeos/arc/arc_support_host_unittest.cc
+++ b/chrome/browser/chromeos/arc/arc_support_host_unittest.cc
@@ -6,8 +6,8 @@
#include "chrome/browser/chromeos/arc/extensions/fake_arc_support.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/test/base/testing_profile.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -60,9 +60,8 @@
~ArcSupportHostTest() override = default;
void SetUp() override {
- user_manager_enabler_ =
- std::make_unique<chromeos::ScopedUserManagerEnabler>(
- new chromeos::FakeChromeUserManager());
+ user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
+ std::make_unique<chromeos::FakeChromeUserManager>());
profile_ = std::make_unique<TestingProfile>();
support_host_ = std::make_unique<ArcSupportHost>(profile_.get());
@@ -115,7 +114,7 @@
std::unique_ptr<TestingProfile> profile_;
std::unique_ptr<ArcSupportHost> support_host_;
std::unique_ptr<FakeArcSupport> fake_arc_support_;
- std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
std::unique_ptr<MockAuthDelegate> auth_delegate_;
std::unique_ptr<MockTermsOfServiceDelegate> tos_delegate_;
diff --git a/chrome/browser/chromeos/arc/arc_util_unittest.cc b/chrome/browser/chromeos/arc/arc_util_unittest.cc
index 443233a..fff6c3a 100644
--- a/chrome/browser/chromeos/arc/arc_util_unittest.cc
+++ b/chrome/browser/chromeos/arc/arc_util_unittest.cc
@@ -14,7 +14,6 @@
#include "chrome/browser/chromeos/arc/arc_session_manager.h"
#include "chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
@@ -32,6 +31,7 @@
#include "components/signin/core/account_id/account_id.h"
#include "components/sync_preferences/testing_pref_service_syncable.h"
#include "components/user_manager/known_user.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "components/user_manager/user_manager.h"
#include "components/user_manager/user_names.h"
#include "content/public/test/test_browser_thread_bundle.h"
@@ -143,9 +143,8 @@
void SetUp() override {
command_line_ = std::make_unique<base::test::ScopedCommandLine>();
- user_manager_enabler_ =
- std::make_unique<chromeos::ScopedUserManagerEnabler>(
- new FakeUserManagerWithLocalState());
+ user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
+ std::make_unique<FakeUserManagerWithLocalState>());
chromeos::WallpaperManager::Initialize();
profile_ = std::make_unique<TestingProfile>();
profile_->set_profile_name(kTestProfileName);
@@ -175,7 +174,7 @@
private:
std::unique_ptr<base::test::ScopedCommandLine> command_line_;
content::TestBrowserThreadBundle thread_bundle_;
- std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
std::unique_ptr<TestingProfile> profile_;
DISALLOW_COPY_AND_ASSIGN(ChromeArcUtilTest);
@@ -532,9 +531,8 @@
~ArcMigrationTest() override {}
void SetUp() override {
- user_manager_enabler_ =
- std::make_unique<chromeos::ScopedUserManagerEnabler>(
- new FakeUserManagerWithLocalState());
+ user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
+ std::make_unique<FakeUserManagerWithLocalState>());
// Used by FakeChromeUserManager.
chromeos::WallpaperManager::Initialize();
profile_ = std::make_unique<TestingProfile>();
@@ -558,7 +556,7 @@
private:
std::unique_ptr<base::test::ScopedCommandLine> command_line_;
content::TestBrowserThreadBundle thread_bundle_;
- std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
std::unique_ptr<TestingProfile> profile_;
DISALLOW_COPY_AND_ASSIGN(ArcMigrationTest);
diff --git a/chrome/browser/chromeos/arc/auth/arc_auth_service_browsertest.cc b/chrome/browser/chromeos/arc/auth/arc_auth_service_browsertest.cc
index b7672154..36c34bf 100644
--- a/chrome/browser/chromeos/arc/auth/arc_auth_service_browsertest.cc
+++ b/chrome/browser/chromeos/arc/auth/arc_auth_service_browsertest.cc
@@ -18,7 +18,6 @@
#include "chrome/browser/chromeos/arc/auth/arc_auth_service.h"
#include "chrome/browser/chromeos/arc/auth/arc_background_auth_code_fetcher.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"
@@ -39,6 +38,7 @@
#include "components/prefs/pref_service.h"
#include "components/signin/core/account_id/account_id.h"
#include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "components/user_manager/user_manager.h"
#include "net/url_request/test_url_fetcher_factory.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -91,9 +91,8 @@
}
void SetUpOnMainThread() override {
- user_manager_enabler_ =
- std::make_unique<chromeos::ScopedUserManagerEnabler>(
- new chromeos::FakeChromeUserManager());
+ user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
+ std::make_unique<chromeos::FakeChromeUserManager>());
// Init ArcSessionManager for testing.
ArcServiceLauncher::Get()->ResetForTesting();
ArcSessionManager::DisableUIForTesting();
@@ -178,7 +177,7 @@
Profile* profile() { return profile_.get(); }
private:
- std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
base::ScopedTempDir temp_dir_;
std::unique_ptr<TestingProfile> profile_;
diff --git a/chrome/browser/chromeos/arc/auth/arc_robot_auth_code_fetcher_browsertest.cc b/chrome/browser/chromeos/arc/auth/arc_robot_auth_code_fetcher_browsertest.cc
index 2ea87539..bff15361 100644
--- a/chrome/browser/chromeos/arc/auth/arc_robot_auth_code_fetcher_browsertest.cc
+++ b/chrome/browser/chromeos/arc/auth/arc_robot_auth_code_fetcher_browsertest.cc
@@ -14,7 +14,6 @@
#include "chrome/browser/chromeos/arc/auth/arc_auth_service.h"
#include "chrome/browser/chromeos/arc/auth/arc_robot_auth_code_fetcher.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
#include "chrome/browser/policy/cloud/test_request_interceptor.h"
#include "chrome/test/base/in_process_browser_test.h"
@@ -23,6 +22,7 @@
#include "components/policy/core/common/cloud/mock_cloud_policy_client.h"
#include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
#include "components/policy/core/common/policy_switches.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/browser/browser_thread.h"
#include "net/base/upload_bytes_element_reader.h"
#include "net/base/upload_data_stream.h"
@@ -82,9 +82,8 @@
"localhost", content::BrowserThread::GetTaskRunnerForThread(
content::BrowserThread::IO));
- user_manager_enabler_ =
- std::make_unique<chromeos::ScopedUserManagerEnabler>(
- new chromeos::FakeChromeUserManager());
+ user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
+ std::make_unique<chromeos::FakeChromeUserManager>());
const AccountId account_id(AccountId::FromUserEmail(kFakeUserName));
GetFakeUserManager()->AddArcKioskAppUser(account_id);
@@ -142,7 +141,7 @@
private:
std::unique_ptr<policy::TestRequestInterceptor> interceptor_;
- std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
DISALLOW_COPY_AND_ASSIGN(ArcRobotAuthCodeFetcherBrowserTest);
};
diff --git a/chrome/browser/chromeos/arc/boot_phase_monitor/arc_boot_phase_monitor_bridge_unittest.cc b/chrome/browser/chromeos/arc/boot_phase_monitor/arc_boot_phase_monitor_bridge_unittest.cc
index f3a3a9e6..b9efdae 100644
--- a/chrome/browser/chromeos/arc/boot_phase_monitor/arc_boot_phase_monitor_bridge_unittest.cc
+++ b/chrome/browser/chromeos/arc/boot_phase_monitor/arc_boot_phase_monitor_bridge_unittest.cc
@@ -10,7 +10,6 @@
#include "base/threading/platform_thread.h"
#include "chrome/browser/chromeos/arc/arc_util.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/test/base/testing_profile.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/fake_session_manager_client.h"
@@ -19,6 +18,7 @@
#include "components/arc/arc_util.h"
#include "components/arc/test/fake_arc_session.h"
#include "components/browser_sync/profile_sync_test_util.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -29,7 +29,8 @@
class ArcBootPhaseMonitorBridgeTest : public testing::Test {
public:
ArcBootPhaseMonitorBridgeTest()
- : user_manager_enabler_(new chromeos::FakeChromeUserManager()) {}
+ : user_manager_enabler_(
+ std::make_unique<chromeos::FakeChromeUserManager>()) {}
~ArcBootPhaseMonitorBridgeTest() override = default;
void SetUp() override {
@@ -117,7 +118,7 @@
std::unique_ptr<ArcSessionManager> arc_session_manager_;
std::unique_ptr<ArcBridgeService> bridge_service_;
std::unique_ptr<ArcBootPhaseMonitorBridge> boot_phase_monitor_bridge_;
- chromeos::ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
size_t disable_cpu_restriction_counter_;
size_t record_uma_counter_;
diff --git a/chrome/browser/chromeos/arc/notification/arc_provision_notification_service_unittest.cc b/chrome/browser/chromeos/arc/notification/arc_provision_notification_service_unittest.cc
index d1451ca..7232ab75 100644
--- a/chrome/browser/chromeos/arc/notification/arc_provision_notification_service_unittest.cc
+++ b/chrome/browser/chromeos/arc/notification/arc_provision_notification_service_unittest.cc
@@ -15,7 +15,6 @@
#include "chrome/browser/chromeos/arc/arc_optin_uma.h"
#include "chrome/browser/chromeos/arc/arc_session_manager.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/test/base/testing_profile.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/fake_session_manager_client.h"
@@ -25,6 +24,7 @@
#include "components/arc/test/fake_arc_session.h"
#include "components/prefs/pref_service.h"
#include "components/sync_preferences/testing_pref_service_syncable.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "components/user_manager/user_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -49,7 +49,8 @@
class ArcProvisionNotificationServiceTest : public testing::Test {
protected:
ArcProvisionNotificationServiceTest()
- : user_manager_enabler_(new chromeos::FakeChromeUserManager()) {}
+ : user_manager_enabler_(
+ std::make_unique<chromeos::FakeChromeUserManager>()) {}
void SetUp() override {
chromeos::DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient(
@@ -119,7 +120,7 @@
private:
content::TestBrowserThreadBundle thread_bundle_;
- chromeos::ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
base::ScopedTempDir temp_dir_;
std::unique_ptr<TestingProfile> profile_;
std::unique_ptr<ArcServiceManager> arc_service_manager_;
diff --git a/chrome/browser/chromeos/arc/optin/arc_terms_of_service_default_negotiator_unittest.cc b/chrome/browser/chromeos/arc/optin/arc_terms_of_service_default_negotiator_unittest.cc
index ee33898..310f341 100644
--- a/chrome/browser/chromeos/arc/optin/arc_terms_of_service_default_negotiator_unittest.cc
+++ b/chrome/browser/chromeos/arc/optin/arc_terms_of_service_default_negotiator_unittest.cc
@@ -13,12 +13,12 @@
#include "chrome/browser/chromeos/arc/extensions/fake_arc_support.h"
#include "chrome/browser/chromeos/arc/optin/arc_terms_of_service_default_negotiator.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
#include "components/arc/arc_prefs.h"
#include "components/prefs/pref_service.h"
#include "components/sync_preferences/testing_pref_service_syncable.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -30,9 +30,8 @@
~ArcTermsOfServiceDefaultNegotiatorTest() override = default;
void SetUp() override {
- user_manager_enabler_ =
- std::make_unique<chromeos::ScopedUserManagerEnabler>(
- new chromeos::FakeChromeUserManager());
+ user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
+ std::make_unique<chromeos::FakeChromeUserManager>());
profile_ = std::make_unique<TestingProfile>();
@@ -60,7 +59,7 @@
content::TestBrowserThreadBundle bundle_;
std::unique_ptr<TestingProfile> profile_;
- std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
std::unique_ptr<ArcSupportHost> support_host_;
std::unique_ptr<FakeArcSupport> fake_arc_support_;
std::unique_ptr<ArcTermsOfServiceNegotiator> negotiator_;
diff --git a/chrome/browser/chromeos/arc/policy/arc_policy_bridge_unittest.cc b/chrome/browser/chromeos/arc/policy/arc_policy_bridge_unittest.cc
index 95c6f5d..7aa583a 100644
--- a/chrome/browser/chromeos/arc/policy/arc_policy_bridge_unittest.cc
+++ b/chrome/browser/chromeos/arc/policy/arc_policy_bridge_unittest.cc
@@ -6,11 +6,11 @@
#include <string>
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/values.h"
#include "chrome/browser/chromeos/arc/policy/arc_policy_bridge.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile_manager.h"
#include "components/arc/arc_bridge_service.h"
@@ -21,6 +21,7 @@
#include "components/policy/core/common/policy_namespace.h"
#include "components/policy/core/common/policy_types.h"
#include "components/policy/policy_constants.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "content/public/test/test_service_manager_context.h"
#include "services/data_decoder/public/cpp/testing_json_parser.h"
@@ -131,8 +132,8 @@
// Setting up user profile for ReportCompliance() tests.
chromeos::FakeChromeUserManager* const fake_user_manager =
new chromeos::FakeChromeUserManager();
- user_manager_enabler_ =
- std::make_unique<chromeos::ScopedUserManagerEnabler>(fake_user_manager);
+ user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
+ base::WrapUnique(fake_user_manager));
const AccountId account_id(
AccountId::FromUserEmailGaiaId("[email protected]", "1111111111"));
fake_user_manager->AddUser(account_id);
@@ -160,7 +161,7 @@
content::TestBrowserThreadBundle thread_bundle_;
data_decoder::TestingJsonParser::ScopedFactoryOverride factory_override_;
content::TestServiceManagerContext service_manager_context_;
- std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
std::unique_ptr<TestingProfileManager> testing_profile_manager_;
base::RunLoop run_loop_;
TestingProfile* profile_;
diff --git a/chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service_unittest.cc b/chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service_unittest.cc
index 4cdb0802..e8f0279 100644
--- a/chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service_unittest.cc
+++ b/chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service_unittest.cc
@@ -13,8 +13,8 @@
#include "ash/shell_test_api.h"
#include "ash/test/ash_test_base.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.h"
#include "chrome/browser/image_decoder.h"
@@ -26,6 +26,7 @@
#include "components/arc/test/fake_wallpaper_instance.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/testing_pref_service.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "components/user_manager/user_names.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/test/test_service_manager_context.h"
@@ -61,7 +62,7 @@
public:
ArcWallpaperServiceTest()
: user_manager_(new chromeos::FakeChromeUserManager()),
- user_manager_enabler_(user_manager_) {}
+ user_manager_enabler_(base::WrapUnique(user_manager_)) {}
~ArcWallpaperServiceTest() override = default;
void SetUp() override {
@@ -118,7 +119,7 @@
private:
chromeos::FakeChromeUserManager* const user_manager_ = nullptr;
- chromeos::ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
arc::ArcServiceManager arc_service_manager_;
// testing_profile_ needs to be deleted before arc_service_manager_.
TestingProfile testing_profile_;
diff --git a/chrome/browser/chromeos/authpolicy/auth_policy_credentials_manager_unittest.cc b/chrome/browser/chromeos/authpolicy/auth_policy_credentials_manager_unittest.cc
index 0a94200..7b4dd30 100644
--- a/chrome/browser/chromeos/authpolicy/auth_policy_credentials_manager_unittest.cc
+++ b/chrome/browser/chromeos/authpolicy/auth_policy_credentials_manager_unittest.cc
@@ -9,7 +9,6 @@
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
#include "chrome/browser/chromeos/login/users/mock_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/notifications/notification_test_util.h"
#include "chrome/browser/notifications/notification_ui_manager.h"
#include "chrome/grit/generated_resources.h"
@@ -18,6 +17,7 @@
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/fake_auth_policy_client.h"
#include "chromeos/network/network_handler.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "components/user_manager/user_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -42,7 +42,7 @@
class AuthPolicyCredentialsManagerTest : public testing::Test {
public:
AuthPolicyCredentialsManagerTest()
- : user_manager_enabler_(new MockUserManager()) {}
+ : user_manager_enabler_(std::make_unique<MockUserManager>()) {}
~AuthPolicyCredentialsManagerTest() override = default;
void SetUp() override {
@@ -128,7 +128,7 @@
// Owned by AuthPolicyCredentialsManagerFactory.
AuthPolicyCredentialsManager* auth_policy_credentials_manager_;
- chromeos::ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
DISALLOW_COPY_AND_ASSIGN(AuthPolicyCredentialsManagerTest);
};
diff --git a/chrome/browser/chromeos/display/display_preferences_unittest.cc b/chrome/browser/chromeos/display/display_preferences_unittest.cc
index dd4271f..2ab305c 100644
--- a/chrome/browser/chromeos/display/display_preferences_unittest.cc
+++ b/chrome/browser/chromeos/display/display_preferences_unittest.cc
@@ -24,11 +24,11 @@
#include "base/values.h"
#include "chrome/browser/chromeos/display/display_configuration_observer.h"
#include "chrome/browser/chromeos/login/users/mock_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_browser_process.h"
#include "components/prefs/scoped_user_pref_update.h"
#include "components/prefs/testing_pref_service.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "ui/display/display_layout_builder.h"
#include "ui/display/manager/chromeos/display_configurator.h"
#include "ui/display/manager/chromeos/test/touch_device_manager_test_api.h"
@@ -96,8 +96,7 @@
protected:
DisplayPreferencesTest()
: mock_user_manager_(new MockUserManager),
- user_manager_enabler_(mock_user_manager_) {
- }
+ user_manager_enabler_(base::WrapUnique(mock_user_manager_)) {}
~DisplayPreferencesTest() override {}
@@ -242,7 +241,7 @@
private:
MockUserManager* mock_user_manager_; // Not owned.
- ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
TestingPrefServiceSimple local_state_;
std::unique_ptr<ash::WindowTreeHostManager::Observer> observer_;
diff --git a/chrome/browser/chromeos/events/event_rewriter_unittest.cc b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
index a548bb60..d241993 100644
--- a/chrome/browser/chromeos/events/event_rewriter_unittest.cc
+++ b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
@@ -16,12 +16,12 @@
#include "chrome/browser/chromeos/input_method/input_method_configuration.h"
#include "chrome/browser/chromeos/input_method/mock_input_method_manager_impl.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/preferences.h"
#include "chrome/common/pref_names.h"
#include "chromeos/chromeos_switches.h"
#include "components/prefs/pref_member.h"
#include "components/sync_preferences/testing_pref_service_syncable.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/aura/window.h"
#include "ui/aura/window_tree_host.h"
@@ -113,7 +113,7 @@
public:
EventRewriterTest()
: fake_user_manager_(new chromeos::FakeChromeUserManager),
- user_manager_enabler_(fake_user_manager_) {}
+ user_manager_enabler_(base::WrapUnique(fake_user_manager_)) {}
~EventRewriterTest() override {}
void SetUp() override {
@@ -155,7 +155,7 @@
}
FakeChromeUserManager* fake_user_manager_; // Not owned.
- ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
input_method::MockInputMethodManagerImpl* input_method_manager_mock_;
sync_preferences::TestingPrefServiceSyncable prefs_;
@@ -2131,7 +2131,7 @@
EventRewriterAshTest()
: source_(&buffer_),
fake_user_manager_(new chromeos::FakeChromeUserManager),
- user_manager_enabler_(fake_user_manager_) {}
+ user_manager_enabler_(base::WrapUnique(fake_user_manager_)) {}
~EventRewriterAshTest() override {}
bool RewriteFunctionKeys(const ui::Event& event,
@@ -2202,7 +2202,7 @@
TestEventSource source_;
chromeos::FakeChromeUserManager* fake_user_manager_; // Not owned.
- chromeos::ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
sync_preferences::TestingPrefServiceSyncable prefs_;
DISALLOW_COPY_AND_ASSIGN(EventRewriterAshTest);
diff --git a/chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api_unittest.cc b/chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api_unittest.cc
index 89821d8b..944f670 100644
--- a/chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api_unittest.cc
+++ b/chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api_unittest.cc
@@ -13,12 +13,12 @@
#include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_storage.h"
#include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/extensions/extension_api_unittest.h"
#include "chrome/browser/signin/easy_unlock_service_factory.h"
#include "chrome/browser/signin/easy_unlock_service_regular.h"
#include "chrome/common/pref_names.h"
#include "chromeos/login/auth/fake_extended_authenticator.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "extensions/browser/api_test_utils.h"
#include "extensions/browser/extension_function_dispatcher.h"
@@ -100,7 +100,7 @@
public:
QuickUnlockPrivateUnitTest()
: fake_user_manager_(new FakeChromeUserManager()),
- scoped_user_manager_(fake_user_manager_) {}
+ scoped_user_manager_(base::WrapUnique(fake_user_manager_)) {}
protected:
void SetUp() override {
@@ -324,7 +324,7 @@
}
FakeChromeUserManager* fake_user_manager_;
- ScopedUserManagerEnabler scoped_user_manager_;
+ user_manager::ScopedUserManager scoped_user_manager_;
QuickUnlockPrivateSetModesFunction::ModesChangedEventHandler
modes_changed_handler_;
bool expect_modes_changed_ = false;
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
index 7c68282..77c66477 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
@@ -10,12 +10,13 @@
#include "ash/wm/window_state.h"
#include "base/command_line.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"
#include "components/signin/core/account_id/account_id.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "extensions/browser/api_test_utils.h"
#include "ui/aura/test/test_windows.h"
#include "ui/aura/window.h"
@@ -31,7 +32,7 @@
public:
WallpaperPrivateApiUnittest()
: fake_user_manager_(new FakeChromeUserManager()),
- scoped_user_manager_(fake_user_manager_) {}
+ scoped_user_manager_(base::WrapUnique(fake_user_manager_)) {}
protected:
FakeChromeUserManager* fake_user_manager() { return fake_user_manager_; }
@@ -41,7 +42,7 @@
private:
FakeChromeUserManager* fake_user_manager_;
- ScopedUserManagerEnabler scoped_user_manager_;
+ user_manager::ScopedUserManager scoped_user_manager_;
DISALLOW_COPY_AND_ASSIGN(WallpaperPrivateApiUnittest);
};
diff --git a/chrome/browser/chromeos/file_manager/path_util_unittest.cc b/chrome/browser/chromeos/file_manager/path_util_unittest.cc
index d49ea57a..1302580 100644
--- a/chrome/browser/chromeos/file_manager/path_util_unittest.cc
+++ b/chrome/browser/chromeos/file_manager/path_util_unittest.cc
@@ -5,10 +5,10 @@
#include "chrome/browser/chromeos/file_manager/path_util.h"
#include "base/files/file_path.h"
+#include "base/memory/ptr_util.h"
#include "base/sys_info.h"
#include "chrome/browser/chromeos/drive/file_system_util.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/chromeos/scoped_set_running_on_chromeos_for_testing.h"
#include "chrome/browser/download/download_prefs.h"
@@ -16,6 +16,7 @@
#include "chrome/test/base/testing_profile.h"
#include "chrome/test/base/testing_profile_manager.h"
#include "components/signin/core/account_id/account_id.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "storage/browser/fileapi/external_mount_points.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -76,7 +77,8 @@
chromeos::FakeChromeUserManager* const fake_user_manager =
new chromeos::FakeChromeUserManager;
- chromeos::ScopedUserManagerEnabler user_manager_enabler(fake_user_manager);
+ user_manager::ScopedUserManager user_manager_enabler(
+ base::WrapUnique(fake_user_manager));
const AccountId account_id(
AccountId::FromUserEmailGaiaId("[email protected]", "1111111111"));
diff --git a/chrome/browser/chromeos/file_system_provider/mount_path_util_unittest.cc b/chrome/browser/chromeos/file_system_provider/mount_path_util_unittest.cc
index 597bded1..8f48a10 100644
--- a/chrome/browser/chromeos/file_system_provider/mount_path_util_unittest.cc
+++ b/chrome/browser/chromeos/file_system_provider/mount_path_util_unittest.cc
@@ -8,18 +8,19 @@
#include <string>
#include "base/files/file.h"
+#include "base/memory/ptr_util.h"
#include "chrome/browser/chromeos/file_system_provider/fake_provided_file_system.h"
#include "chrome/browser/chromeos/file_system_provider/provided_file_system_interface.h"
#include "chrome/browser/chromeos/file_system_provider/service.h"
#include "chrome/browser/chromeos/file_system_provider/service_factory.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/extensions/api/file_system_provider_capabilities/file_system_provider_capabilities_handler.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
#include "chrome/test/base/testing_profile_manager.h"
#include "components/keyed_service/core/keyed_service.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/browser/browser_context.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "extensions/browser/extension_registry.h"
@@ -69,7 +70,8 @@
ASSERT_TRUE(profile_manager_->SetUp());
profile_ = profile_manager_->CreateTestingProfile("testing-profile");
user_manager_ = new FakeChromeUserManager();
- user_manager_enabler_.reset(new ScopedUserManagerEnabler(user_manager_));
+ user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
+ base::WrapUnique(user_manager_));
user_manager_->AddUser(
AccountId::FromUserEmail(profile_->GetProfileUserName()));
file_system_provider_service_ = Service::Get(profile_);
@@ -80,7 +82,7 @@
content::TestBrowserThreadBundle thread_bundle_;
std::unique_ptr<TestingProfileManager> profile_manager_;
TestingProfile* profile_; // Owned by TestingProfileManager.
- std::unique_ptr<ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
FakeChromeUserManager* user_manager_;
Service* file_system_provider_service_; // Owned by its factory.
};
diff --git a/chrome/browser/chromeos/file_system_provider/service_unittest.cc b/chrome/browser/chromeos/file_system_provider/service_unittest.cc
index 31d76fa..e376c3a0 100644
--- a/chrome/browser/chromeos/file_system_provider/service_unittest.cc
+++ b/chrome/browser/chromeos/file_system_provider/service_unittest.cc
@@ -21,12 +21,12 @@
#include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"
#include "chrome/browser/chromeos/file_system_provider/registry_interface.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/common/extensions/api/file_system_provider_capabilities/file_system_provider_capabilities_handler.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
#include "chrome/test/base/testing_profile_manager.h"
#include "components/sync_preferences/testing_pref_service_syncable.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "components/user_prefs/user_prefs.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "extensions/browser/extension_registry.h"
@@ -211,7 +211,8 @@
user_manager_ = new FakeChromeUserManager();
user_manager_->AddUser(
AccountId::FromUserEmail(profile_->GetProfileUserName()));
- user_manager_enabler_.reset(new ScopedUserManagerEnabler(user_manager_));
+ user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
+ base::WrapUnique(user_manager_));
extension_registry_.reset(new extensions::ExtensionRegistry(profile_));
service_.reset(new Service(profile_, extension_registry_.get()));
@@ -234,7 +235,7 @@
std::unique_ptr<TestingProfileManager> profile_manager_;
TestingProfile* profile_;
FakeChromeUserManager* user_manager_;
- std::unique_ptr<ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
std::unique_ptr<extensions::ExtensionRegistry> extension_registry_;
std::unique_ptr<Service> service_;
scoped_refptr<extensions::Extension> extension_;
diff --git a/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc b/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc
index f6e6368..224bd547 100644
--- a/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc
+++ b/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc
@@ -5,10 +5,10 @@
#include "chrome/browser/chromeos/input_method/input_method_persistence.h"
#include "base/command_line.h"
+#include "base/memory/ptr_util.h"
#include "chrome/browser/chromeos/input_method/mock_input_method_manager_impl.h"
#include "chrome/browser/chromeos/language_preferences.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/common/chrome_constants.h"
@@ -20,6 +20,7 @@
#include "chromeos/chromeos_switches.h"
#include "components/prefs/pref_service.h"
#include "components/sync_preferences/testing_pref_service_syncable.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -37,7 +38,7 @@
InputMethodPersistenceTest()
: mock_profile_manager_(TestingBrowserProcess::GetGlobal()),
fake_user_manager_(new chromeos::FakeChromeUserManager()),
- user_manager_enabler_(fake_user_manager_) {}
+ user_manager_enabler_(base::WrapUnique(fake_user_manager_)) {}
void SetUp() override {
ASSERT_TRUE(mock_profile_manager_.SetUp());
@@ -75,7 +76,7 @@
MockInputMethodManagerImpl mock_manager_;
TestingProfileManager mock_profile_manager_;
chromeos::FakeChromeUserManager* fake_user_manager_;
- chromeos::ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
};
TEST_F(InputMethodPersistenceTest, TestLifetime) {
diff --git a/chrome/browser/chromeos/lock_screen_apps/state_controller_unittest.cc b/chrome/browser/chromeos/lock_screen_apps/state_controller_unittest.cc
index 2f87ab69..9ca9281 100644
--- a/chrome/browser/chromeos/lock_screen_apps/state_controller_unittest.cc
+++ b/chrome/browser/chromeos/lock_screen_apps/state_controller_unittest.cc
@@ -26,7 +26,6 @@
#include "chrome/browser/chromeos/lock_screen_apps/focus_cycler_delegate.h"
#include "chrome/browser/chromeos/lock_screen_apps/state_observer.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/note_taking_helper.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/extensions/extension_service.h"
@@ -44,6 +43,7 @@
#include "components/arc/arc_service_manager.h"
#include "components/arc/arc_session.h"
#include "components/session_manager/core/session_manager.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_observer.h"
#include "content/public/test/test_browser_thread_bundle.h"
@@ -394,7 +394,7 @@
public:
LockScreenAppStateTest()
: fake_user_manager_(new chromeos::FakeChromeUserManager),
- user_manager_enabler_(fake_user_manager_),
+ user_manager_enabler_(base::WrapUnique(fake_user_manager_)),
profile_manager_(TestingBrowserProcess::GetGlobal()) {}
~LockScreenAppStateTest() override = default;
@@ -704,7 +704,7 @@
std::unique_ptr<base::test::ScopedCommandLine> command_line_;
chromeos::FakeChromeUserManager* fake_user_manager_;
- chromeos::ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
TestingProfileManager profile_manager_;
// Run loop used to throttle test until async state controller initialization
diff --git a/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc b/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc
index 9f5bd82f..a8168a5 100644
--- a/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc
+++ b/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc
@@ -19,7 +19,6 @@
#include "base/strings/string_util.h"
#include "chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
@@ -45,6 +44,7 @@
#include "chromeos/login/auth/user_context.h"
#include "chromeos/login/login_state.h"
#include "components/ownership/mock_owner_key_util.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "content/public/test/test_utils.h"
#include "crypto/nss_key_util.h"
@@ -183,7 +183,7 @@
CryptohomeAuthenticatorTest()
: user_context_(AccountId::FromUserEmail("[email protected]")),
user_manager_(new chromeos::FakeChromeUserManager()),
- user_manager_enabler_(user_manager_),
+ user_manager_enabler_(base::WrapUnique(user_manager_)),
mock_caller_(NULL),
owner_key_util_(new ownership::MockOwnerKeyUtil()) {
// Testing profile must be initialized after user_manager_ +
@@ -367,7 +367,7 @@
chromeos::FakeChromeUserManager* user_manager_;
std::unique_ptr<TestingProfile> profile_;
std::unique_ptr<TestingProfileManager> profile_manager_;
- ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
cryptohome::MockAsyncMethodCaller* mock_caller_;
diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc
index 4f55001..60afda3f 100644
--- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc
+++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc
@@ -6,13 +6,13 @@
#include "base/base64.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.h"
#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/prefs/browser_prefs.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/pref_names.h"
@@ -23,6 +23,7 @@
#include "components/prefs/scoped_user_pref_update.h"
#include "components/prefs/testing_pref_service.h"
#include "components/sync_preferences/testing_pref_service_syncable.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "crypto/scoped_test_nss_chromeos_user.h"
@@ -196,7 +197,7 @@
EasyUnlockTpmKeyManagerTest()
: thread_bundle_(content::TestBrowserThreadBundle::REAL_IO_THREAD),
user_manager_(new chromeos::FakeChromeUserManager()),
- user_manager_enabler_(user_manager_),
+ user_manager_enabler_(base::WrapUnique(user_manager_)),
profile_manager_(TestingBrowserProcess::GetGlobal()) {}
~EasyUnlockTpmKeyManagerTest() override {}
@@ -344,7 +345,7 @@
// Needed to properly set up signin and user profiles for test.
chromeos::FakeChromeUserManager* user_manager_;
- chromeos::ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
TestingProfileManager profile_manager_;
// The testing profiles that own EasyUnlockTPMKeyManager services.
diff --git a/chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc b/chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc
index 8199aa9..6928e50 100644
--- a/chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc
@@ -5,19 +5,20 @@
#include <string>
#include <utility>
+#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.h"
#include "chrome/browser/chromeos/login/existing_user_controller.h"
#include "chrome/browser/chromeos/login/ui/mock_login_display.h"
#include "chrome/browser/chromeos/login/ui/mock_login_display_host.h"
#include "chrome/browser/chromeos/login/users/mock_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/policy/device_local_account.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
#include "chrome/test/base/scoped_testing_local_state.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chromeos/settings/cros_settings_names.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -43,7 +44,7 @@
ExistingUserControllerAutoLoginTest()
: local_state_(TestingBrowserProcess::GetGlobal()),
mock_user_manager_(new MockUserManager()),
- scoped_user_manager_(mock_user_manager_) {}
+ scoped_user_manager_(base::WrapUnique(mock_user_manager_)) {}
void SetUp() override {
mock_login_display_host_.reset(new MockLoginDisplayHost);
@@ -147,7 +148,7 @@
ScopedDeviceSettingsTestHelper device_settings_test_helper_;
ScopedTestCrosSettings test_cros_settings_;
MockUserManager* mock_user_manager_;
- ScopedUserManagerEnabler scoped_user_manager_;
+ user_manager::ScopedUserManager scoped_user_manager_;
std::unique_ptr<ArcKioskAppManager> arc_kiosk_app_manager_;
// |existing_user_controller_| must be destroyed before
diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc
index 99116a4..5f30707 100644
--- a/chrome/browser/chromeos/login/kiosk_browsertest.cc
+++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc
@@ -13,6 +13,7 @@
#include "base/bind_helpers.h"
#include "base/location.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/path_service.h"
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
@@ -31,7 +32,6 @@
#include "chrome/browser/chromeos/login/ui/login_display_host_webui.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
#include "chrome/browser/chromeos/login/users/mock_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
#include "chrome/browser/chromeos/ownership/fake_owner_settings_service.h"
#include "chrome/browser/chromeos/policy/device_local_account.h"
@@ -57,6 +57,7 @@
#include "components/prefs/pref_service.h"
#include "components/signin/core/browser/signin_manager.h"
#include "components/signin/core/browser/signin_pref_names.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/notification_service.h"
@@ -2382,7 +2383,7 @@
// Add a device owner.
FakeChromeUserManager* user_manager = new FakeChromeUserManager();
user_manager->AddUser(test_owner_account_id_);
- ScopedUserManagerEnabler enabler(user_manager);
+ user_manager::ScopedUserManager enabler(base::WrapUnique(user_manager));
// Set kiosk app to autolaunch.
EnableConsumerKioskMode();
diff --git a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc
index 97b598c..a70270be 100644
--- a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc
+++ b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
#include "base/message_loop/message_loop.h"
#include "base/test/simple_test_clock.h"
@@ -12,7 +13,6 @@
#include "base/time/clock.h"
#include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory.h"
#include "chrome/browser/chromeos/login/users/mock_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_browser_process.h"
@@ -20,6 +20,7 @@
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/prefs/pref_service.h"
#include "components/prefs/testing_pref_service.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "extensions/browser/quota_service.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -61,7 +62,7 @@
scoped_refptr<base::TestSimpleTaskRunner> runner_;
MockUserManager* user_manager_; // Not owned.
- ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
std::unique_ptr<TestingProfile> profile_;
base::SimpleTestClock clock_;
@@ -76,7 +77,7 @@
SAMLOfflineSigninLimiterTest::SAMLOfflineSigninLimiterTest()
: runner_(new base::TestSimpleTaskRunner),
user_manager_(new MockUserManager),
- user_manager_enabler_(user_manager_),
+ user_manager_enabler_(base::WrapUnique(user_manager_)),
limiter_(NULL) {}
SAMLOfflineSigninLimiterTest::~SAMLOfflineSigninLimiterTest() {
diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc b/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc
index 5abfe621..6ce5dc5 100644
--- a/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc
+++ b/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc
@@ -33,7 +33,6 @@
#include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
#include "chrome/browser/chromeos/login/users/default_user_image/default_user_images.h"
#include "chrome/browser/chromeos/login/users/mock_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
#include "chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.h"
@@ -62,6 +61,7 @@
#include "components/prefs/pref_change_registrar.h"
#include "components/prefs/pref_service.h"
#include "components/prefs/scoped_user_pref_update.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "components/user_manager/user.h"
#include "components/user_manager/user_image/user_image.h"
#include "components/user_manager/user_manager.h"
diff --git a/chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc b/chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc
index c16942f2..7bfbcdb 100644
--- a/chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc
+++ b/chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc
@@ -9,11 +9,11 @@
#include <memory>
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
#include "chrome/browser/chromeos/login/users/multi_profile_user_controller_delegate.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/policy/policy_cert_service.h"
#include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
#include "chrome/browser/chromeos/policy/policy_cert_verifier.h"
@@ -25,6 +25,7 @@
#include "chrome/test/base/testing_profile.h"
#include "chrome/test/base/testing_profile_manager.h"
#include "components/sync_preferences/testing_pref_service_syncable.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "components/user_manager/user_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "net/cert/x509_certificate.h"
@@ -123,7 +124,7 @@
public:
MultiProfileUserControllerTest()
: fake_user_manager_(new FakeChromeUserManager),
- user_manager_enabler_(fake_user_manager_),
+ user_manager_enabler_(base::WrapUnique(fake_user_manager_)),
user_not_allowed_count_(0) {
for (size_t i = 0; i < arraysize(kUsers); ++i) {
test_users_.push_back(AccountId::FromUserEmail(kUsers[i]));
@@ -214,7 +215,7 @@
std::unique_ptr<policy::PolicyCertVerifier> cert_verifier_;
std::unique_ptr<TestingProfileManager> profile_manager_;
FakeChromeUserManager* fake_user_manager_; // Not owned
- ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
std::unique_ptr<MultiProfileUserController> controller_;
diff --git a/chrome/browser/chromeos/login/users/scoped_user_manager_enabler.cc b/chrome/browser/chromeos/login/users/scoped_user_manager_enabler.cc
deleted file mode 100644
index 8b73964f..0000000
--- a/chrome/browser/chromeos/login/users/scoped_user_manager_enabler.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2014 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 "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
-
-#include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
-
-namespace chromeos {
-
-ScopedUserManagerEnabler::ScopedUserManagerEnabler(
- ChromeUserManager* user_manager) {
- if (user_manager::UserManager::GetForTesting())
- user_manager::UserManager::GetForTesting()->Shutdown();
-
- previous_user_manager_ =
- user_manager::UserManager::SetForTesting(user_manager);
-}
-
-ScopedUserManagerEnabler::~ScopedUserManagerEnabler() {
- // Shutdown and destroy current UserManager instance that we track.
- user_manager::UserManager::Get()->Shutdown();
- delete user_manager::UserManager::Get();
- user_manager::UserManager::SetInstance(nullptr);
-
- user_manager::UserManager::SetForTesting(previous_user_manager_);
-}
-
-} // namespace chromeos
diff --git a/chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h b/chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h
deleted file mode 100644
index 98857c5..0000000
--- a/chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2014 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.
-
-#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_SCOPED_USER_MANAGER_ENABLER_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_SCOPED_USER_MANAGER_ENABLER_H_
-
-#include "base/macros.h"
-
-namespace user_manager {
-class UserManager;
-}
-
-namespace chromeos {
-
-class ChromeUserManager;
-
-// Helper class for unit tests. Initializes the UserManager singleton to the
-// given |user_manager| and tears it down again on destruction. If the singleton
-// had already been initialized, its previous value is restored after tearing
-// down |user_manager|.
-class ScopedUserManagerEnabler {
- public:
- // Takes ownership of |user_manager|.
- explicit ScopedUserManagerEnabler(ChromeUserManager* user_manager);
- ~ScopedUserManagerEnabler();
-
- private:
- user_manager::UserManager* previous_user_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedUserManagerEnabler);
-};
-
-} // namespace chromeos
-
-#endif // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_SCOPED_USER_MANAGER_ENABLER_H_
diff --git a/chrome/browser/chromeos/login/users/user_manager_unittest.cc b/chrome/browser/chromeos/login/users/user_manager_unittest.cc
index 0396ddb..47bf69c 100644
--- a/chrome/browser/chromeos/login/users/user_manager_unittest.cc
+++ b/chrome/browser/chromeos/login/users/user_manager_unittest.cc
@@ -12,7 +12,6 @@
#include "base/run_loop.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.h"
@@ -27,6 +26,7 @@
#include "chromeos/settings/cros_settings_names.h"
#include "components/prefs/pref_service.h"
#include "components/user_manager/known_user.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "components/user_manager/user.h"
#include "components/user_manager/user_manager.h"
#include "content/public/common/content_switches.h"
@@ -119,8 +119,8 @@
user_manager_enabler_.reset();
// Initialize the UserManager singleton to a fresh ChromeUserManagerImpl
// instance.
- user_manager_enabler_.reset(
- new ScopedUserManagerEnabler(new ChromeUserManagerImpl));
+ user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
+ ChromeUserManagerImpl::CreateChromeUserManager());
// ChromeUserManagerImpl ctor posts a task to reload policies.
base::RunLoop().RunUntilIdle();
@@ -153,7 +153,7 @@
ScopedCrosSettingsTestHelper settings_helper_;
std::unique_ptr<ScopedTestingLocalState> local_state_;
- std::unique_ptr<ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
base::ScopedTempDir temp_dir_;
};
diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc
index e17f3a0..5ce7ee4 100644
--- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc
+++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc
@@ -14,9 +14,9 @@
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
+#include "base/memory/ptr_util.h"
#include "chrome/browser/chromeos/login/startup_utils.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/chromeos/settings/device_settings_service.h"
#include "chrome/browser/prefs/browser_prefs.h"
@@ -26,6 +26,7 @@
#include "chromeos/settings/cros_settings_provider.h"
#include "components/prefs/pref_service.h"
#include "components/prefs/testing_pref_service.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/image/image.h"
@@ -37,7 +38,7 @@
public:
WallpaperManagerCacheTest()
: fake_user_manager_(new FakeChromeUserManager()),
- scoped_user_manager_(fake_user_manager_) {}
+ scoped_user_manager_(base::WrapUnique(fake_user_manager_)) {}
protected:
~WallpaperManagerCacheTest() override {}
@@ -64,7 +65,7 @@
private:
FakeChromeUserManager* fake_user_manager_;
- ScopedUserManagerEnabler scoped_user_manager_;
+ user_manager::ScopedUserManager scoped_user_manager_;
};
TEST_F(WallpaperManagerCacheTest, VerifyWallpaperCache) {
diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc b/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc
index 4b18539..7feca17e 100644
--- a/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc
+++ b/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc
@@ -11,13 +11,13 @@
#include "base/command_line.h"
#include "base/compiler_specific.h"
#include "base/logging.h"
+#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_base.h"
#include "base/metrics/histogram_samples.h"
#include "base/metrics/statistics_recorder.h"
#include "base/run_loop.h"
#include "base/test/histogram_tester.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/net/network_portal_detector_test_utils.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
@@ -32,6 +32,7 @@
#include "chromeos/network/portal_detector/network_portal_detector_strategy.h"
#include "components/captive_portal/captive_portal_detector.h"
#include "components/captive_portal/captive_portal_testing_utils.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "components/user_manager/user_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "dbus/object_path.h"
@@ -84,7 +85,8 @@
cl->AppendSwitch(switches::kDisableNetworkPortalNotification);
FakeChromeUserManager* user_manager = new FakeChromeUserManager();
- user_manager_enabler_.reset(new ScopedUserManagerEnabler(user_manager));
+ user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
+ base::WrapUnique(user_manager));
DBusThreadManager::Initialize();
base::StatisticsRecorder::Initialize();
@@ -296,7 +298,7 @@
Profile* profile_ = nullptr;
std::unique_ptr<NetworkPortalDetectorImpl> network_portal_detector_;
std::unique_ptr<base::HistogramSamples> original_samples_;
- std::unique_ptr<ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
TestingProfileManager test_profile_manager_;
};
diff --git a/chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc b/chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc
index 6b77088..81a68e9 100644
--- a/chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc
+++ b/chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/browser/chromeos/net/network_portal_notification_controller.h"
#include "base/command_line.h"
#include "base/macros.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
-#include "chrome/browser/chromeos/net/network_portal_notification_controller.h"
#include "chromeos/chromeos_switches.h"
#include "chromeos/network/network_state.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/message_center/message_center.h"
#include "ui/message_center/message_center_observer.h"
@@ -65,7 +65,8 @@
class NetworkPortalNotificationControllerTest : public testing::Test {
public:
NetworkPortalNotificationControllerTest()
- : user_manager_enabler_(new chromeos::FakeChromeUserManager()),
+ : user_manager_enabler_(
+ std::make_unique<chromeos::FakeChromeUserManager>()),
controller_(nullptr) {}
~NetworkPortalNotificationControllerTest() override {}
@@ -91,7 +92,7 @@
NotificationObserver& observer() { return observer_; }
private:
- ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
NetworkPortalNotificationController controller_;
NotificationObserver observer_;
diff --git a/chrome/browser/chromeos/net/network_pref_state_observer_unittest.cc b/chrome/browser/chromeos/net/network_pref_state_observer_unittest.cc
index 6f543d0e..acf612d 100644
--- a/chrome/browser/chromeos/net/network_pref_state_observer_unittest.cc
+++ b/chrome/browser/chromeos/net/network_pref_state_observer_unittest.cc
@@ -11,7 +11,6 @@
#include "base/run_loop.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile_manager.h"
@@ -22,6 +21,7 @@
#include "components/prefs/pref_service.h"
#include "components/proxy_config/proxy_config_pref_names.h"
#include "components/proxy_config/proxy_prefs.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_source.h"
@@ -39,8 +39,8 @@
class NetworkPrefStateObserverTest : public testing::Test {
public:
NetworkPrefStateObserverTest()
- : fake_user_manager_(new chromeos::FakeChromeUserManager),
- user_manager_enabler_(fake_user_manager_),
+ : fake_user_manager_(new FakeChromeUserManager),
+ user_manager_enabler_(base::WrapUnique(fake_user_manager_)),
profile_manager_(TestingBrowserProcess::GetGlobal()) {}
~NetworkPrefStateObserverTest() override {}
@@ -74,7 +74,7 @@
content::TestBrowserThreadBundle thread_bundle_;
FakeChromeUserManager* fake_user_manager_;
- chromeos::ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
TestingProfileManager profile_manager_;
std::unique_ptr<NetworkPrefStateObserver> network_pref_state_observer_;
diff --git a/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl_unittest.cc b/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl_unittest.cc
index f58c1ca..bd9739e 100644
--- a/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl_unittest.cc
+++ b/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl_unittest.cc
@@ -12,7 +12,6 @@
#include "base/memory/ptr_util.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h"
#include "chrome/browser/chromeos/settings/device_settings_service.h"
@@ -31,6 +30,7 @@
#include "components/invalidation/public/invalidator_state.h"
#include "components/keyed_service/core/keyed_service.h"
#include "components/policy/core/common/cloud/cloud_policy_constants.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_service.h"
@@ -132,7 +132,7 @@
private:
content::TestBrowserThreadBundle thread_bundle_;
chromeos::FakeChromeUserManager* fake_user_manager_;
- chromeos::ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
chromeos::ScopedStubInstallAttributes install_attributes_;
std::unique_ptr<chromeos::ScopedTestDeviceSettingsService>
test_device_settings_service_;
@@ -192,7 +192,7 @@
: device_invalidation_service_(nullptr),
profile_invalidation_service_(nullptr),
fake_user_manager_(new chromeos::FakeChromeUserManager),
- user_manager_enabler_(fake_user_manager_),
+ user_manager_enabler_(base::WrapUnique(fake_user_manager_)),
install_attributes_(
chromeos::ScopedStubInstallAttributes::CreateCloudManaged(
"example.com",
diff --git a/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc b/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc
index f79046fa..64687f9 100644
--- a/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc
+++ b/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc
@@ -26,7 +26,6 @@
#include "chrome/browser/chromeos/app_mode/kiosk_app_data.h"
#include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
#include "chrome/browser/chromeos/login/users/mock_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/ownership/fake_owner_settings_service.h"
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
#include "chrome/browser/chromeos/policy/device_local_account.h"
@@ -57,6 +56,7 @@
#include "components/policy/proto/device_management_backend.pb.h"
#include "components/prefs/pref_service.h"
#include "components/prefs/testing_pref_service.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "content/public/test/test_utils.h"
@@ -282,7 +282,7 @@
"device_id")),
settings_helper_(false),
user_manager_(new chromeos::MockUserManager()),
- user_manager_enabler_(user_manager_),
+ user_manager_enabler_(base::WrapUnique(user_manager_)),
got_session_status_(false),
fake_device_local_account_(policy::DeviceLocalAccount::TYPE_KIOSK_APP,
kKioskAccountId,
@@ -505,7 +505,7 @@
// Only set after MockRunningKioskApp was called.
std::unique_ptr<TestingProfile> testing_profile_;
chromeos::MockUserManager* const user_manager_;
- chromeos::ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
em::DeviceStatusReportRequest device_status_;
em::SessionStatusReportRequest session_status_;
bool got_session_status_;
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc
index e0d000d..3a58485 100644
--- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc
@@ -20,7 +20,6 @@
#include "base/strings/utf_string_conversions.h"
#include "base/test/test_simple_task_runner.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/policy/cloud/cloud_policy_test_utils.h"
@@ -48,6 +47,7 @@
#include "components/signin/core/browser/profile_oauth2_token_service.h"
#include "components/signin/core/browser/signin_manager.h"
#include "components/sync_preferences/pref_service_syncable.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "google_apis/gaia/gaia_auth_consumer.h"
#include "google_apis/gaia/gaia_constants.h"
@@ -111,7 +111,7 @@
profile_(NULL),
signin_profile_(NULL),
user_manager_(new chromeos::FakeChromeUserManager()),
- user_manager_enabler_(user_manager_) {}
+ user_manager_enabler_(base::WrapUnique(user_manager_)) {}
void SetUp() override {
// The initialization path that blocks on the initial policy fetch requires
@@ -335,7 +335,7 @@
TestingProfile* signin_profile_;
chromeos::FakeChromeUserManager* user_manager_;
- chromeos::ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
private:
void CreateManager(std::unique_ptr<MockCloudPolicyStore> store,
diff --git a/chrome/browser/chromeos/power/extension_event_observer_unittest.cc b/chrome/browser/chromeos/power/extension_event_observer_unittest.cc
index 63f07ca9..e8bf096 100644
--- a/chrome/browser/chromeos/power/extension_event_observer_unittest.cc
+++ b/chrome/browser/chromeos/power/extension_event_observer_unittest.cc
@@ -14,7 +14,6 @@
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/chromeos/settings/device_settings_service.h"
#include "chrome/common/extensions/api/gcm.h"
@@ -24,6 +23,7 @@
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/fake_power_manager_client.h"
#include "chromeos/dbus/power_manager/suspend.pb.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "content/public/test/test_renderer_host.h"
#include "extensions/browser/extension_host.h"
@@ -45,7 +45,7 @@
: power_manager_client_(new FakePowerManagerClient()),
test_screen_(aura::TestScreen::Create(gfx::Size())),
fake_user_manager_(new FakeChromeUserManager()),
- scoped_user_manager_enabler_(fake_user_manager_) {
+ scoped_user_manager_enabler_(base::WrapUnique(fake_user_manager_)) {
DBusThreadManager::GetSetterForTesting()->SetPowerManagerClient(
base::WrapUnique(power_manager_client_));
@@ -151,7 +151,7 @@
// Owned by |scoped_user_manager_enabler_|.
FakeChromeUserManager* fake_user_manager_;
- ScopedUserManagerEnabler scoped_user_manager_enabler_;
+ user_manager::ScopedUserManager scoped_user_manager_enabler_;
std::vector<scoped_refptr<extensions::Extension>> created_apps_;
diff --git a/chrome/browser/chromeos/power/power_prefs_unittest.cc b/chrome/browser/chromeos/power/power_prefs_unittest.cc
index 12116645..5e6acdf 100644
--- a/chrome/browser/chromeos/power/power_prefs_unittest.cc
+++ b/chrome/browser/chromeos/power/power_prefs_unittest.cc
@@ -11,10 +11,10 @@
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/extensions/extension_special_storage_policy.h"
#include "chrome/browser/prefs/browser_prefs.h"
@@ -33,6 +33,7 @@
#include "components/signin/core/account_id/account_id.h"
#include "components/sync_preferences/pref_service_syncable.h"
#include "components/sync_preferences/testing_pref_service_syncable.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_source.h"
@@ -259,14 +260,14 @@
private:
FakeChromeUserManager* user_manager_;
- ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
DISALLOW_COPY_AND_ASSIGN(PowerPrefsUserSessionTest);
};
PowerPrefsUserSessionTest::PowerPrefsUserSessionTest()
: user_manager_(new FakeChromeUserManager),
- user_manager_enabler_(user_manager_) {}
+ user_manager_enabler_(base::WrapUnique(user_manager_)) {}
void PowerPrefsUserSessionTest::SetUp() {
PowerPrefsTest::SetUp();
diff --git a/chrome/browser/chromeos/preferences_unittest.cc b/chrome/browser/chromeos/preferences_unittest.cc
index 326921cb..5ea6717 100644
--- a/chrome/browser/chromeos/preferences_unittest.cc
+++ b/chrome/browser/chromeos/preferences_unittest.cc
@@ -8,13 +8,13 @@
#include "base/json/json_string_value_serializer.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "chrome/browser/chromeos/input_method/input_method_configuration.h"
#include "chrome/browser/chromeos/input_method/mock_input_method_manager_impl.h"
#include "chrome/browser/chromeos/login/session/user_session_manager.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_browser_process.h"
@@ -32,6 +32,7 @@
#include "components/sync/protocol/preference_specifics.pb.h"
#include "components/sync/protocol/sync.pb.h"
#include "components/sync_preferences/testing_pref_service_syncable.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "content/public/test/test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -154,8 +155,8 @@
chromeos::FakeChromeUserManager* user_manager =
new chromeos::FakeChromeUserManager();
- user_manager_enabler_.reset(
- new chromeos::ScopedUserManagerEnabler(user_manager));
+ user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
+ base::WrapUnique(user_manager));
const char test_user_email[] = "[email protected]";
const AccountId test_account_id(AccountId::FromUserEmail(test_user_email));
@@ -197,7 +198,7 @@
content::TestBrowserThreadBundle thread_bundle_;
std::unique_ptr<TestingProfileManager> profile_manager_;
- std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
std::unique_ptr<Preferences> prefs_;
StringPrefMember previous_input_method_;
StringPrefMember current_input_method_;
diff --git a/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc b/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc
index 6c292443..bccb423 100644
--- a/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc
@@ -10,7 +10,6 @@
#include "base/strings/string16.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/profiles/avatar_menu.h"
#include "chrome/browser/profiles/avatar_menu_observer.h"
@@ -23,6 +22,7 @@
#include "chrome/test/base/testing_profile.h"
#include "chrome/test/base/testing_profile_manager.h"
#include "components/sync_preferences/pref_service_syncable.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -63,8 +63,8 @@
// Initialize the UserManager singleton to a fresh FakeChromeUserManager
// instance.
- user_manager_enabler_.reset(
- new ScopedUserManagerEnabler(new FakeChromeUserManager));
+ user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
+ std::make_unique<FakeChromeUserManager>());
}
FakeChromeUserManager* GetFakeChromeUserManager() {
@@ -112,7 +112,7 @@
content::TestBrowserThreadBundle thread_bundle_;
TestingProfileManager manager_;
std::unique_ptr<MockObserver> mock_observer_;
- std::unique_ptr<ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
std::unique_ptr<AvatarMenu> avatar_menu_;
ChromeShellDelegate chrome_shell_delegate_;
diff --git a/chrome/browser/chromeos/settings/device_settings_test_helper.cc b/chrome/browser/chromeos/settings/device_settings_test_helper.cc
index c9886afc2..759139d 100644
--- a/chrome/browser/chromeos/settings/device_settings_test_helper.cc
+++ b/chrome/browser/chromeos/settings/device_settings_test_helper.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
+#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/threading/sequenced_worker_pool.h"
@@ -39,7 +40,7 @@
DeviceSettingsTestBase::DeviceSettingsTestBase()
: thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
user_manager_(new FakeChromeUserManager()),
- user_manager_enabler_(user_manager_),
+ user_manager_enabler_(base::WrapUnique(user_manager_)),
owner_key_util_(new ownership::MockOwnerKeyUtil()) {
OwnerSettingsServiceChromeOSFactory::SetDeviceSettingsServiceForTesting(
&device_settings_service_);
diff --git a/chrome/browser/chromeos/settings/device_settings_test_helper.h b/chrome/browser/chromeos/settings/device_settings_test_helper.h
index 85890ca..58af5306 100644
--- a/chrome/browser/chromeos/settings/device_settings_test_helper.h
+++ b/chrome/browser/chromeos/settings/device_settings_test_helper.h
@@ -13,11 +13,11 @@
#include "base/message_loop/message_loop.h"
#include "base/strings/string_util.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/policy/device_policy_builder.h"
#include "chrome/browser/chromeos/settings/device_settings_service.h"
#include "chromeos/dbus/fake_session_manager_client.h"
#include "components/ownership/mock_owner_key_util.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -68,7 +68,7 @@
// Note that FakeUserManager is used by ProfileHelper, which some of the
// tested classes depend on implicitly.
FakeChromeUserManager* user_manager_;
- ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
scoped_refptr<ownership::MockOwnerKeyUtil> owner_key_util_;
// Local DeviceSettingsService instance for tests. Avoid using in combination
// with the global instance (DeviceSettingsService::Get()).
diff --git a/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc b/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc
index 7bbc02fe..659624b 100644
--- a/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc
+++ b/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc
@@ -14,9 +14,9 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
#include "base/time/time.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"
#include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
@@ -28,6 +28,7 @@
#include "components/policy/proto/chrome_device_policy.pb.h"
#include "components/policy/proto/device_management_backend.pb.h"
#include "components/user_manager/fake_user_manager.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "content/public/test/test_utils.h"
#include "crypto/rsa_private_key.h"
@@ -70,7 +71,7 @@
SessionManagerOperationTest()
: owner_key_util_(new ownership::MockOwnerKeyUtil()),
user_manager_(new chromeos::FakeChromeUserManager()),
- user_manager_enabler_(user_manager_),
+ user_manager_enabler_(base::WrapUnique(user_manager_)),
validated_(false) {
OwnerSettingsServiceChromeOSFactory::GetInstance()
->SetOwnerKeyUtilForTesting(owner_key_util_);
@@ -114,7 +115,7 @@
scoped_refptr<ownership::MockOwnerKeyUtil> owner_key_util_;
chromeos::FakeChromeUserManager* user_manager_;
- ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
std::unique_ptr<TestingProfile> profile_;
OwnerSettingsServiceChromeOS* service_;
diff --git a/chrome/browser/chromeos/status/data_promo_notification_unittest.cc b/chrome/browser/chromeos/status/data_promo_notification_unittest.cc
index c1fbaf5..13d9ccf 100644
--- a/chrome/browser/chromeos/status/data_promo_notification_unittest.cc
+++ b/chrome/browser/chromeos/status/data_promo_notification_unittest.cc
@@ -8,7 +8,6 @@
#include "base/macros.h"
#include "base/run_loop.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile_manager.h"
@@ -19,6 +18,7 @@
#include "chromeos/login/login_state.h"
#include "chromeos/network/network_connect.h"
#include "chromeos/network/network_state_handler.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/platform_test.h"
#include "third_party/cros_system_api/dbus/service_constants.h"
@@ -96,8 +96,8 @@
const AccountId test_account_id(AccountId::FromUserEmail(kTestUserName));
user_manager->AddUser(test_account_id);
user_manager->LoginUser(test_account_id);
- user_manager_enabler_.reset(
- new ScopedUserManagerEnabler(user_manager.release()));
+ user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
+ std::move(user_manager));
profile_manager_.reset(
new TestingProfileManager(TestingBrowserProcess::GetGlobal()));
@@ -147,7 +147,7 @@
content::TestBrowserThreadBundle thread_bundle_;
std::unique_ptr<DataPromoNotification> data_promo_notification_;
std::unique_ptr<NetworkConnectTestDelegate> network_connect_delegate_;
- std::unique_ptr<ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
std::unique_ptr<TestingProfileManager> profile_manager_;
private:
diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc b/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc
index d82f80f..a6f1be8 100644
--- a/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc
+++ b/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc
@@ -10,6 +10,7 @@
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
#include "base/path_service.h"
#include "base/strings/string_number_conversions.h"
@@ -22,7 +23,6 @@
#include "base/values.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/chromeos/login/users/mock_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/system/automatic_reboot_manager_observer.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_browser_process.h"
@@ -32,6 +32,7 @@
#include "chromeos/dbus/fake_update_engine_client.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/testing_pref_service.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_service.h"
@@ -204,7 +205,7 @@
TestingPrefServiceSimple local_state_;
MockUserManager* mock_user_manager_; // Not owned.
- ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
FakePowerManagerClient* power_manager_client_ = nullptr; // Not owned.
FakeUpdateEngineClient* update_engine_client_ = nullptr; // Not owned.
@@ -305,7 +306,7 @@
reset_main_thread_task_runner_(
base::ThreadTaskRunnerHandle::OverrideForTesting(task_runner_)),
mock_user_manager_(new MockUserManager),
- user_manager_enabler_(mock_user_manager_) {}
+ user_manager_enabler_(base::WrapUnique(mock_user_manager_)) {}
AutomaticRebootManagerBasicTest::~AutomaticRebootManagerBasicTest() {
}
diff --git a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest_chromeos.cc b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest_chromeos.cc
index 324abaf..9dc4388 100644
--- a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest_chromeos.cc
+++ b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest_chromeos.cc
@@ -4,14 +4,15 @@
#include <memory>
+#include "base/memory/ptr_util.h"
#include "chrome/browser/apps/app_browsertest_util.h"
#include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/ownership/fake_owner_settings_service.h"
#include "chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.h"
#include "chrome/browser/extensions/extension_apitest.h"
#include "components/signin/core/account_id/account_id.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/test/browser_test.h"
#include "extensions/common/switches.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -47,15 +48,15 @@
protected:
chromeos::FakeChromeUserManager* fake_user_manager_;
- std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
chromeos::ScopedCrosSettingsTestHelper settings_helper_;
std::unique_ptr<chromeos::FakeOwnerSettingsService> owner_settings_service_;
void EnterKioskSession() {
fake_user_manager_ = new chromeos::FakeChromeUserManager();
- user_manager_enabler_.reset(
- new chromeos::ScopedUserManagerEnabler(fake_user_manager_));
+ user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
+ base::WrapUnique(fake_user_manager_));
const AccountId kiosk_account_id(
AccountId::FromUserEmail("[email protected]"));
diff --git a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api_unittest.cc b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api_unittest.cc
index 4bdd019d..3221368 100644
--- a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api_unittest.cc
+++ b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api_unittest.cc
@@ -8,11 +8,11 @@
#include "base/bind.h"
#include "base/location.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/stringprintf.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/values.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.h"
#include "chrome/browser/chromeos/settings/stub_install_attributes.h"
#include "chrome/browser/extensions/extension_function_test_utils.h"
@@ -32,6 +32,7 @@
#include "components/prefs/pref_service.h"
#include "components/signin/core/account_id/account_id.h"
#include "components/signin/core/browser/signin_manager.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "extensions/common/extension_builder.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -129,7 +130,7 @@
extension_(ExtensionBuilder("Test").Build()),
profile_manager_(TestingBrowserProcess::GetGlobal()),
fake_user_manager_(new chromeos::FakeChromeUserManager),
- user_manager_enabler_(fake_user_manager_) {
+ user_manager_enabler_(base::WrapUnique(fake_user_manager_)) {
// Set up the default behavior of mocks.
ON_CALL(mock_async_method_caller_, TpmAttestationRegisterKey(_, _, _, _))
.WillByDefault(Invoke(RegisterKeyCallbackTrue));
@@ -218,7 +219,7 @@
TestingProfileManager profile_manager_;
// fake_user_manager_ is owned by user_manager_enabler_.
chromeos::FakeChromeUserManager* fake_user_manager_;
- chromeos::ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
PrefService* prefs_ = nullptr;
};
diff --git a/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api_unittest.cc b/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api_unittest.cc
index ac88e53..ce5790a 100644
--- a/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api_unittest.cc
+++ b/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api_unittest.cc
@@ -8,11 +8,11 @@
#include "base/bind.h"
#include "base/location.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/stringprintf.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/values.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.h"
#include "chrome/browser/chromeos/settings/stub_install_attributes.h"
@@ -34,6 +34,7 @@
#include "components/prefs/pref_service.h"
#include "components/signin/core/account_id/account_id.h"
#include "components/signin/core/browser/signin_manager.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "extensions/common/extension_builder.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -134,7 +135,7 @@
profile_manager_(TestingBrowserProcess::GetGlobal()),
profile_type_(profile_type),
fake_user_manager_(new chromeos::FakeChromeUserManager),
- user_manager_enabler_(fake_user_manager_) {
+ user_manager_enabler_(base::WrapUnique(fake_user_manager_)) {
// Create the extension.
extension_ = CreateExtension();
@@ -204,7 +205,7 @@
ProfileType profile_type_;
// fake_user_manager_ is owned by user_manager_enabler_.
chromeos::FakeChromeUserManager* fake_user_manager_;
- chromeos::ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
PrefService* prefs_ = nullptr;
private:
diff --git a/chrome/browser/extensions/api/file_system/consent_provider_unittest.cc b/chrome/browser/extensions/api/file_system/consent_provider_unittest.cc
index 2c432f5..cae7ed04 100644
--- a/chrome/browser/extensions/api/file_system/consent_provider_unittest.cc
+++ b/chrome/browser/extensions/api/file_system/consent_provider_unittest.cc
@@ -7,14 +7,15 @@
#include <string>
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "base/run_loop.h"
#include "chrome/browser/chromeos/file_manager/volume_manager.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/test/base/testing_browser_process.h"
#include "components/prefs/testing_pref_service.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "components/user_manager/user.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "extensions/common/extension.h"
@@ -107,8 +108,9 @@
TestingBrowserProcess::GetGlobal()->SetLocalState(
testing_pref_service_.get());
user_manager_ = new chromeos::FakeChromeUserManager;
- scoped_user_manager_enabler_.reset(
- new chromeos::ScopedUserManagerEnabler(user_manager_));
+ scoped_user_manager_enabler_ =
+ std::make_unique<user_manager::ScopedUserManager>(
+ base::WrapUnique(user_manager_));
}
void TearDown() override {
@@ -123,8 +125,7 @@
std::unique_ptr<TestingPrefServiceSimple> testing_pref_service_;
chromeos::FakeChromeUserManager*
user_manager_; // Owned by the scope enabler.
- std::unique_ptr<chromeos::ScopedUserManagerEnabler>
- scoped_user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> scoped_user_manager_enabler_;
content::TestBrowserThreadBundle thread_bundle_;
};
diff --git a/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc b/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc
index f481fbb2..9fa91d2 100644
--- a/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc
+++ b/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc
@@ -7,6 +7,7 @@
#include "base/files/scoped_temp_dir.h"
#include "base/location.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/path_service.h"
#include "base/threading/thread_task_runner_handle.h"
#include "chrome/browser/apps/app_browsertest_util.h"
@@ -14,13 +15,13 @@
#include "chrome/browser/chromeos/drive/file_system_util.h"
#include "chrome/browser/chromeos/file_manager/volume_manager.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/extensions/api/file_system/consent_provider.h"
#include "chrome/browser/extensions/component_loader.h"
#include "chrome/common/chrome_paths.h"
#include "components/drive/chromeos/file_system_interface.h"
#include "components/drive/service/fake_drive_service.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/test/test_utils.h"
#include "extensions/browser/api/file_system/file_system_api.h"
#include "extensions/browser/event_router.h"
@@ -239,7 +240,7 @@
protected:
base::ScopedTempDir temp_dir_;
chromeos::FakeChromeUserManager* fake_user_manager_;
- std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
// Creates a testing file system in a testing directory.
void CreateTestingFileSystem(const std::string& mount_point_name,
@@ -264,8 +265,8 @@
// Simulates entering the kiosk session.
void EnterKioskSession() {
fake_user_manager_ = new chromeos::FakeChromeUserManager();
- user_manager_enabler_.reset(
- new chromeos::ScopedUserManagerEnabler(fake_user_manager_));
+ user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
+ base::WrapUnique(fake_user_manager_));
const AccountId kiosk_app_account_id =
AccountId::FromUserEmail("[email protected]");
diff --git a/chrome/browser/extensions/api/identity/identity_apitest.cc b/chrome/browser/extensions/api/identity/identity_apitest.cc
index 3727606..bcfbd6f 100644
--- a/chrome/browser/extensions/api/identity/identity_apitest.cc
+++ b/chrome/browser/extensions/api/identity/identity_apitest.cc
@@ -18,9 +18,9 @@
#include "components/prefs/pref_service.h"
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/login/users/mock_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
#include "chrome/browser/chromeos/settings/stub_install_attributes.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "extensions/common/extension_builder.h"
#endif
#include "chrome/browser/extensions/api/identity/identity_api.h"
@@ -1883,7 +1883,8 @@
IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionPublicSessionTest, NonWhitelisted) {
// GetAuthToken() should return UserNotSignedIn in public sessions for
// non-whitelisted extensions.
- chromeos::ScopedUserManagerEnabler user_manager_enabler(user_manager_);
+ user_manager::ScopedUserManager user_manager_enabler(
+ base::WrapUnique(user_manager_));
scoped_refptr<FakeGetAuthTokenFunction> func(new FakeGetAuthTokenFunction());
func->set_extension(CreateTestExtension("test-id"));
std::string error = utils::RunFunctionAndReturnError(
@@ -1895,7 +1896,8 @@
IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionPublicSessionTest, Whitelisted) {
// GetAuthToken() should return a token for whitelisted extensions.
- chromeos::ScopedUserManagerEnabler user_manager_enabler(user_manager_);
+ user_manager::ScopedUserManager user_manager_enabler(
+ base::WrapUnique(user_manager_));
scoped_refptr<FakeGetAuthTokenFunction> func(new FakeGetAuthTokenFunction());
func->set_extension(CreateTestExtension("ljacajndfccfgnfohlgkdphmbnpkjflk"));
func->set_mint_token_result(TestOAuth2MintTokenFlow::MINT_TOKEN_SUCCESS);
diff --git a/chrome/browser/extensions/crx_installer_browsertest.cc b/chrome/browser/extensions/crx_installer_browsertest.cc
index 801da55..badd827 100644
--- a/chrome/browser/extensions/crx_installer_browsertest.cc
+++ b/chrome/browser/extensions/crx_installer_browsertest.cc
@@ -61,9 +61,9 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/extensions/extension_assets_manager_chromeos.h"
#include "chromeos/chromeos_switches.h"
+#include "components/user_manager/scoped_user_manager.h"
#endif
class SkBitmap;
@@ -747,7 +747,8 @@
const AccountId account_id(AccountId::FromUserEmail("[email protected]"));
fake_user_manager->AddKioskAppUser(account_id);
fake_user_manager->LoginUser(account_id);
- chromeos::ScopedUserManagerEnabler scoped_user_manager(fake_user_manager);
+ user_manager::ScopedUserManager scoped_user_manager(
+ base::WrapUnique(fake_user_manager));
EXPECT_TRUE(InstallExtension(crx_path, 1));
}
diff --git a/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc b/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc
index e06dac1..ede4187e8 100644
--- a/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc
+++ b/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc
@@ -14,7 +14,6 @@
#include "base/strings/string_util.h"
#include "base/values.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/extensions/extension_assets_manager_chromeos.h"
#include "chrome/browser/extensions/extension_service.h"
@@ -26,6 +25,7 @@
#include "components/prefs/scoped_user_pref_update.h"
#include "components/prefs/testing_pref_service.h"
#include "components/signin/core/account_id/account_id.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "components/user_manager/user_manager.h"
#include "components/user_manager/user_names.h"
#include "content/public/browser/plugin_service.h"
@@ -59,8 +59,8 @@
// Initialize the UserManager singleton to a fresh FakeChromeUserManager
// instance.
- user_manager_enabler_.reset(new chromeos::ScopedUserManagerEnabler(
- new chromeos::FakeChromeUserManager));
+ user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
+ std::make_unique<chromeos::FakeChromeUserManager>());
GetFakeUserManager()->AddUser(user_manager::StubAccountId());
GetFakeUserManager()->LoginUser(user_manager::StubAccountId());
@@ -139,7 +139,7 @@
}
private:
- std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
base::ScopedTempDir cache_dir_;
};
diff --git a/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc b/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc
index adc29fc..7bec2245 100644
--- a/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc
+++ b/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc
@@ -8,13 +8,13 @@
#include "base/command_line.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/test/scoped_path_override.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
#include "chrome/browser/chromeos/customization/customization_document.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_service_test_base.h"
#include "chrome/browser/prefs/pref_service_syncable_util.h"
@@ -37,6 +37,7 @@
#include "components/sync/model/sync_change_processor.h"
#include "components/sync/model/sync_error_factory_mock.h"
#include "components/sync_preferences/pref_service_syncable.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/browser/notification_service.h"
#include "content/public/test/test_utils.h"
@@ -51,7 +52,7 @@
public:
ExternalProviderImplChromeOSTest()
: fake_user_manager_(new chromeos::FakeChromeUserManager()),
- scoped_user_manager_(fake_user_manager_) {}
+ scoped_user_manager_(base::WrapUnique(fake_user_manager_)) {}
~ExternalProviderImplChromeOSTest() override {}
@@ -89,7 +90,7 @@
std::unique_ptr<base::ScopedPathOverride> external_externsions_overrides_;
chromeos::system::ScopedFakeStatisticsProvider fake_statistics_provider_;
chromeos::FakeChromeUserManager* fake_user_manager_;
- chromeos::ScopedUserManagerEnabler scoped_user_manager_;
+ user_manager::ScopedUserManager scoped_user_manager_;
DISALLOW_COPY_AND_ASSIGN(ExternalProviderImplChromeOSTest);
};
diff --git a/chrome/browser/extensions/external_provider_impl_unittest.cc b/chrome/browser/extensions/external_provider_impl_unittest.cc
index abc2bc6..d154419 100644
--- a/chrome/browser/extensions/external_provider_impl_unittest.cc
+++ b/chrome/browser/extensions/external_provider_impl_unittest.cc
@@ -37,9 +37,9 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/customization/customization_document.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chromeos/system/fake_statistics_provider.h"
#include "chromeos/system/statistics_provider.h"
+#include "components/user_manager/scoped_user_manager.h"
#endif
using ::testing::NotNull;
@@ -62,8 +62,8 @@
void InitServiceWithExternalProviders() {
#if defined(OS_CHROMEOS)
- chromeos::ScopedUserManagerEnabler scoped_user_manager(
- new chromeos::FakeChromeUserManager);
+ user_manager::ScopedUserManager scoped_user_manager(
+ std::make_unique<chromeos::FakeChromeUserManager>());
#endif
InitializeExtensionServiceWithUpdaterAndPrefs();
diff --git a/chrome/browser/extensions/update_install_gate_unittest.cc b/chrome/browser/extensions/update_install_gate_unittest.cc
index 0adc1fb..afc26475 100644
--- a/chrome/browser/extensions/update_install_gate_unittest.cc
+++ b/chrome/browser/extensions/update_install_gate_unittest.cc
@@ -28,9 +28,9 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/chromeos/settings/device_settings_service.h"
+#include "components/user_manager/scoped_user_manager.h"
#endif
namespace extensions {
@@ -118,8 +118,9 @@
// Needed to allow ChromeProcessManagerDelegate to allow background pages.
fake_user_manager_ = new chromeos::FakeChromeUserManager();
// Takes ownership of fake_user_manager_.
- scoped_user_manager_enabler_.reset(
- new chromeos::ScopedUserManagerEnabler(fake_user_manager_));
+ scoped_user_manager_enabler_ =
+ std::make_unique<user_manager::ScopedUserManager>(
+ base::WrapUnique(fake_user_manager_));
fake_user_manager_->AddUser(account_id);
fake_user_manager_->LoginUser(account_id);
#endif
@@ -216,8 +217,7 @@
#if defined(OS_CHROMEOS)
// Needed for creating ExtensionService.
chromeos::FakeChromeUserManager* fake_user_manager_ = nullptr;
- std::unique_ptr<chromeos::ScopedUserManagerEnabler>
- scoped_user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> scoped_user_manager_enabler_;
#endif
std::unique_ptr<UpdateInstallGate> delayer_;
diff --git a/chrome/browser/extensions/user_script_listener_unittest.cc b/chrome/browser/extensions/user_script_listener_unittest.cc
index e8c9988..4ae6338 100644
--- a/chrome/browser/extensions/user_script_listener_unittest.cc
+++ b/chrome/browser/extensions/user_script_listener_unittest.cc
@@ -37,7 +37,7 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
+#include "components/user_manager/scoped_user_manager.h"
#endif
using content::ResourceThrottle;
@@ -152,9 +152,8 @@
void SetUp() override {
#if defined(OS_CHROMEOS)
- user_manager_enabler_ =
- base::MakeUnique<chromeos::ScopedUserManagerEnabler>(
- new chromeos::FakeChromeUserManager());
+ user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
+ std::make_unique<chromeos::FakeChromeUserManager>());
#endif
ASSERT_TRUE(profile_manager_->SetUp());
profile_ = profile_manager_->CreateTestingProfile("test-profile");
@@ -225,7 +224,7 @@
TestingProfile* profile_;
ExtensionService* service_;
#if defined(OS_CHROMEOS)
- std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
#endif
};
diff --git a/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc b/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc
index bc6c2e1..99e7f7bf 100644
--- a/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc
+++ b/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc
@@ -7,13 +7,14 @@
#include <string>
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/metrics/chromeos_metrics_provider.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/power_manager_client.h"
#include "chromeos/login/login_state.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "components/user_manager/user_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "content/public/test/test_utils.h"
@@ -137,7 +138,8 @@
// |scoped_enabler| takes over the lifetime of |user_manager|.
chromeos::FakeChromeUserManager* user_manager =
new chromeos::FakeChromeUserManager();
- chromeos::ScopedUserManagerEnabler scoped_enabler(user_manager);
+ user_manager::ScopedUserManager scoped_enabler(
+ base::WrapUnique(user_manager));
user_manager->AddKioskAppUser(account_id1);
user_manager->AddKioskAppUser(account_id2);
user_manager->AddKioskAppUser(account_id3);
@@ -160,7 +162,8 @@
// |scoped_enabler| takes over the lifetime of |user_manager|.
chromeos::FakeChromeUserManager* user_manager =
new chromeos::FakeChromeUserManager();
- chromeos::ScopedUserManagerEnabler scoped_enabler(user_manager);
+ user_manager::ScopedUserManager scoped_enabler(
+ base::WrapUnique(user_manager));
user_manager->AddKioskAppUser(account_id1);
user_manager->AddKioskAppUser(account_id2);
user_manager->AddKioskAppUser(account_id3);
diff --git a/chrome/browser/notifications/chrome_ash_message_center_client_unittest.cc b/chrome/browser/notifications/chrome_ash_message_center_client_unittest.cc
index cf40329..05a80db 100644
--- a/chrome/browser/notifications/chrome_ash_message_center_client_unittest.cc
+++ b/chrome/browser/notifications/chrome_ash_message_center_client_unittest.cc
@@ -13,7 +13,6 @@
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/test_extension_system.h"
@@ -24,6 +23,7 @@
#include "chrome/test/base/testing_profile_manager.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
#include "components/content_settings/core/common/content_settings_types.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "extensions/common/extension.h"
#include "extensions/common/extension_builder.h"
@@ -42,8 +42,8 @@
ASSERT_TRUE(testing_profile_manager_.SetUp());
// Initialize the UserManager singleton to a fresh FakeUserManager instance.
- user_manager_enabler_.reset(new chromeos::ScopedUserManagerEnabler(
- new chromeos::FakeChromeUserManager));
+ user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
+ std::make_unique<chromeos::FakeChromeUserManager>());
}
void TearDown() override { client_.reset(); }
@@ -97,7 +97,7 @@
content::TestBrowserThreadBundle thread_bundle_;
TestingProfileManager testing_profile_manager_;
std::unique_ptr<ChromeAshMessageCenterClient> client_;
- std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
DISALLOW_COPY_AND_ASSIGN(ChromeAshMessageCenterClientTest);
};
diff --git a/chrome/browser/policy/profile_policy_connector_unittest.cc b/chrome/browser/policy/profile_policy_connector_unittest.cc
index 278dae07..21b56ccd 100644
--- a/chrome/browser/policy/profile_policy_connector_unittest.cc
+++ b/chrome/browser/policy/profile_policy_connector_unittest.cc
@@ -30,7 +30,7 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
+#include "components/user_manager/scoped_user_manager.h"
#endif // defined(OS_CHROMEOS)
using testing::Return;
@@ -97,8 +97,8 @@
#if defined(OS_CHROMEOS)
TEST_F(ProfilePolicyConnectorTest, ManagedRealmForActiveDirectoryUsers) {
- chromeos::ScopedUserManagerEnabler scoped_user_manager_enabler(
- new chromeos::FakeChromeUserManager);
+ user_manager::ScopedUserManager scoped_user_manager_enabler(
+ std::make_unique<chromeos::FakeChromeUserManager>());
ProfilePolicyConnector connector;
const AccountId account_id =
AccountId::AdFromUserEmailObjGuid("[email protected]", "obj-guid");
diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc
index 66ef77a..7d8d3f842 100644
--- a/chrome/browser/profiles/profile_manager_unittest.cc
+++ b/chrome/browser/profiles/profile_manager_unittest.cc
@@ -52,12 +52,12 @@
#if defined(OS_CHROMEOS)
#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/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/chromeos/settings/device_settings_service.h"
#include "chromeos/chromeos_switches.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "components/user_manager/user_manager.h"
#include "components/user_manager/user_names.h"
#include "extensions/common/features/feature_session_type.h"
@@ -284,7 +284,7 @@
const AccountId test_account_id(AccountId::FromUserEmail(kTestUserName));
chromeos::FakeChromeUserManager* user_manager =
new chromeos::FakeChromeUserManager();
- chromeos::ScopedUserManagerEnabler enabler(user_manager);
+ user_manager::ScopedUserManager enabler(base::WrapUnique(user_manager));
const user_manager::User* active_user =
user_manager->AddUser(test_account_id);
diff --git a/chrome/browser/signin/easy_unlock_service_unittest_chromeos.cc b/chrome/browser/signin/easy_unlock_service_unittest_chromeos.cc
index d9cf821..d8f327e 100644
--- a/chrome/browser/signin/easy_unlock_service_unittest_chromeos.cc
+++ b/chrome/browser/signin/easy_unlock_service_unittest_chromeos.cc
@@ -12,10 +12,10 @@
#include <utility>
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/values.h"
#include "chrome/browser/chromeos/login/users/mock_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/signin/easy_unlock_app_manager.h"
#include "chrome/browser/signin/easy_unlock_notification_controller.h"
@@ -30,6 +30,7 @@
#include "components/signin/core/account_id/account_id.h"
#include "components/signin/core/browser/signin_manager_base.h"
#include "components/sync_preferences/testing_pref_service_syncable.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "device/bluetooth/bluetooth_adapter_factory.h"
#include "device/bluetooth/test/mock_bluetooth_adapter.h"
@@ -219,7 +220,7 @@
public:
EasyUnlockServiceTest()
: mock_user_manager_(new testing::NiceMock<chromeos::MockUserManager>()),
- scoped_user_manager_(mock_user_manager_),
+ scoped_user_manager_(base::WrapUnique(mock_user_manager_)),
is_bluetooth_adapter_present_(true) {}
~EasyUnlockServiceTest() override {}
@@ -326,7 +327,7 @@
chromeos::MockUserManager* mock_user_manager_;
private:
- chromeos::ScopedUserManagerEnabler scoped_user_manager_;
+ user_manager::ScopedUserManager scoped_user_manager_;
FakePowerManagerClient* power_manager_client_;
diff --git a/chrome/browser/signin/signin_error_notifier_ash_unittest.cc b/chrome/browser/signin/signin_error_notifier_ash_unittest.cc
index 663a35f37..9877d15 100644
--- a/chrome/browser/signin/signin_error_notifier_ash_unittest.cc
+++ b/chrome/browser/signin/signin_error_notifier_ash_unittest.cc
@@ -9,10 +9,10 @@
#include <memory>
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "build/build_config.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/login/users/mock_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/notifications/notification_ui_manager.h"
#include "chrome/browser/signin/fake_signin_manager_builder.h"
#include "chrome/browser/signin/signin_error_controller_factory.h"
@@ -25,6 +25,7 @@
#include "components/signin/core/browser/fake_auth_status_provider.h"
#include "components/signin/core/browser/signin_error_controller.h"
#include "components/signin/core/browser/signin_manager.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/message_center/notification.h"
@@ -47,8 +48,8 @@
ASSERT_TRUE(profile_manager_->SetUp());
mock_user_manager_ = new chromeos::MockUserManager();
- user_manager_enabler_.reset(
- new chromeos::ScopedUserManagerEnabler(mock_user_manager_));
+ user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
+ base::WrapUnique(mock_user_manager_));
error_controller_ =
SigninErrorControllerFactory::GetForProfile(GetProfile());
@@ -84,7 +85,7 @@
SigninErrorController* error_controller_;
NotificationUIManager* notification_ui_manager_;
chromeos::MockUserManager* mock_user_manager_; // Not owned.
- std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
};
TEST_F(SigninErrorNotifierTest, NoErrorAuthStatusProviders) {
diff --git a/chrome/browser/sync/sync_error_notifier_ash_unittest.cc b/chrome/browser/sync/sync_error_notifier_ash_unittest.cc
index 6109908..7534f8f6 100644
--- a/chrome/browser/sync/sync_error_notifier_ash_unittest.cc
+++ b/chrome/browser/sync/sync_error_notifier_ash_unittest.cc
@@ -10,7 +10,6 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/login/users/mock_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/notifications/notification_ui_manager.h"
#include "chrome/browser/sync/profile_sync_test_util.h"
#include "chrome/browser/ui/browser.h"
@@ -21,6 +20,7 @@
#include "chrome/test/base/testing_profile.h"
#include "chrome/test/base/testing_profile_manager.h"
#include "components/browser_sync/profile_sync_service_mock.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/message_center/notification.h"
@@ -147,8 +147,8 @@
// Test that SyncErrorNotifier shows an notification if a passphrase is
// required.
TEST_F(SyncErrorNotifierTest, PassphraseNotification) {
- chromeos::ScopedUserManagerEnabler scoped_enabler(
- new chromeos::MockUserManager());
+ user_manager::ScopedUserManager scoped_enabler(
+ std::make_unique<chromeos::MockUserManager>());
ASSERT_FALSE(notification_ui_manager_->FindById(
kNotificationId, NotificationUIManager::GetProfileID(profile_)));
diff --git a/chrome/browser/ui/app_list/arc/arc_app_test.cc b/chrome/browser/ui/app_list/arc/arc_app_test.cc
index 0111d38..32f8d41 100644
--- a/chrome/browser/ui/app_list/arc/arc_app_test.cc
+++ b/chrome/browser/ui/app_list/arc/arc_app_test.cc
@@ -13,7 +13,6 @@
#include "chrome/browser/chromeos/arc/arc_session_manager.h"
#include "chrome/browser/chromeos/arc/arc_util.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
@@ -25,6 +24,7 @@
#include "components/arc/arc_util.h"
#include "components/arc/test/fake_app_instance.h"
#include "components/arc/test/fake_arc_session.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
@@ -45,8 +45,8 @@
}
ArcAppTest::ArcAppTest() {
- user_manager_enabler_.reset(new chromeos::ScopedUserManagerEnabler(
- new chromeos::FakeChromeUserManager()));
+ user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
+ std::make_unique<chromeos::FakeChromeUserManager>());
CreateFakeAppsAndPackages();
}
diff --git a/chrome/browser/ui/app_list/arc/arc_app_test.h b/chrome/browser/ui/app_list/arc/arc_app_test.h
index db1fa73..6336dec0c 100644
--- a/chrome/browser/ui/app_list/arc/arc_app_test.h
+++ b/chrome/browser/ui/app_list/arc/arc_app_test.h
@@ -25,10 +25,10 @@
namespace chromeos {
class FakeChromeUserManager;
-class ScopedUserManagerEnabler;
}
namespace user_manager {
+class ScopedUserManager;
class User;
}
@@ -109,7 +109,7 @@
arc_play_store_enabled_preference_handler_;
std::unique_ptr<arc::FakeAppInstance> app_instance_;
- std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
std::vector<arc::mojom::AppInfo> fake_apps_;
std::vector<arc::mojom::AppInfo> fake_default_apps_;
std::vector<arc::mojom::ArcPackageInfo> fake_packages_;
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
index d4d85ef..e8cc34c 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
@@ -40,7 +40,6 @@
#include "chrome/browser/chromeos/arc/arc_util.h"
#include "chrome/browser/chromeos/ash_config.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/test_extension_system.h"
@@ -97,6 +96,7 @@
#include "components/sync_preferences/pref_model_associator.h"
#include "components/sync_preferences/testing_pref_service_syncable.h"
#include "components/user_manager/fake_user_manager.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_observer.h"
#include "content/public/test/test_utils.h"
@@ -1171,8 +1171,8 @@
profile_manager_->SetLoggedIn(true);
// Initialize the UserManager singleton to a fresh FakeUserManager instance.
- user_manager_enabler_.reset(new chromeos::ScopedUserManagerEnabler(
- new chromeos::FakeChromeUserManager));
+ user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
+ std::make_unique<chromeos::FakeChromeUserManager>());
// Initialize the WallpaperManager singleton.
chromeos::WallpaperManager::Initialize();
@@ -1287,7 +1287,7 @@
user_manager::UserManager::Get());
}
- std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
ProfileToNameMap created_profiles_;
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc
index 593d6dc4..4b482e5 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc
@@ -9,13 +9,14 @@
#include "base/format_macros.h"
#include "base/logging.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/stringprintf.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/ui/ash/multi_user/multi_user_context_menu.h"
#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"
#include "components/signin/core/account_id/account_id.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "ui/aura/window.h"
#include "ui/base/models/menu_model.h"
@@ -27,7 +28,7 @@
MultiUserContextMenuChromeOSTest()
: multi_user_window_manager_(nullptr),
fake_user_manager_(new chromeos::FakeChromeUserManager),
- user_manager_enabler_(fake_user_manager_) {}
+ user_manager_enabler_(base::WrapUnique(fake_user_manager_)) {}
void SetUp() override;
void TearDown() override;
@@ -61,7 +62,7 @@
chrome::MultiUserWindowManagerChromeOS* multi_user_window_manager_;
// Owned by |user_manager_enabler_|.
chromeos::FakeChromeUserManager* fake_user_manager_ = nullptr;
- chromeos::ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
DISALLOW_COPY_AND_ASSIGN(MultiUserContextMenuChromeOSTest);
};
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc
index c53b2ad9..62754dd 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "ash/test/ash_test_base.h"
+#include "base/memory/ptr_util.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/signin/account_tracker_service_factory.h"
#include "chrome/browser/signin/fake_signin_manager_builder.h"
@@ -13,6 +13,7 @@
#include "chrome/test/base/testing_profile.h"
#include "components/signin/core/account_id/account_id.h"
#include "components/signin/core/browser/account_tracker_service.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "components/user_manager/user.h"
namespace ash {
@@ -58,8 +59,8 @@
AshTestBase::SetUp();
fake_user_manager_ = new chromeos::FakeChromeUserManager;
- user_manager_enabler_.reset(
- new chromeos::ScopedUserManagerEnabler(fake_user_manager_));
+ user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
+ base::WrapUnique(fake_user_manager_));
TestingProfile::Builder builder;
builder.AddTestingFactory(SigninManagerFactory::GetInstance(),
@@ -106,7 +107,7 @@
std::unique_ptr<MultiUserTestingProfile> profile_;
// |fake_user_manager_| is owned by |user_manager_enabler_|.
chromeos::FakeChromeUserManager* fake_user_manager_;
- std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
DISALLOW_COPY_AND_ASSIGN(MultiUserUtilTest);
};
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
index 8e61d11..8ad7ad0 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
@@ -23,12 +23,12 @@
#include "base/compiler_specific.h"
#include "base/logging.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/strings/string_piece.h"
#include "base/strings/string_util.h"
#include "base/time/time.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/ui/ash/chrome_new_window_client.h"
@@ -46,6 +46,7 @@
#include "chrome/test/base/testing_profile.h"
#include "chrome/test/base/testing_profile_manager.h"
#include "components/signin/core/account_id/account_id.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "components/user_manager/user_info.h"
#include "components/user_manager/user_manager.h"
#include "ui/aura/client/aura_constants.h"
@@ -148,7 +149,7 @@
MultiUserWindowManagerChromeOSTest()
: multi_user_window_manager_(NULL),
fake_user_manager_(new chromeos::FakeChromeUserManager),
- user_manager_enabler_(fake_user_manager_) {}
+ user_manager_enabler_(base::WrapUnique(fake_user_manager_)) {}
void SetUp() override;
void TearDown() override;
@@ -293,7 +294,7 @@
std::unique_ptr<TestingProfileManager> profile_manager_;
- chromeos::ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
// The maximized window manager (if enabled).
std::unique_ptr<TabletModeWindowManager> tablet_mode_window_manager_;
diff --git a/chrome/browser/ui/ash/session_controller_client_unittest.cc b/chrome/browser/ui/ash/session_controller_client_unittest.cc
index f3bd4b2..c243c200 100644
--- a/chrome/browser/ui/ash/session_controller_client_unittest.cc
+++ b/chrome/browser/ui/ash/session_controller_client_unittest.cc
@@ -9,12 +9,12 @@
#include <vector>
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
#include "base/time/time.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
#include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/policy/policy_cert_service.h"
#include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
#include "chrome/browser/chromeos/policy/policy_cert_verifier.h"
@@ -29,6 +29,7 @@
#include "components/prefs/pref_service.h"
#include "components/session_manager/core/session_manager.h"
#include "components/signin/core/account_id/account_id.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "components/user_manager/user_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "net/cert/x509_certificate.h"
@@ -176,8 +177,8 @@
// Initialize the UserManager singleton.
user_manager_ = new TestChromeUserManager;
- user_manager_enabler_.reset(
- new chromeos::ScopedUserManagerEnabler(user_manager_));
+ user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
+ base::WrapUnique(user_manager_));
profile_manager_.reset(
new TestingProfileManager(TestingBrowserProcess::GetGlobal()));
@@ -252,7 +253,7 @@
session_manager::SessionManager session_manager_;
private:
- std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
// Owned by |user_manager_enabler_|.
TestChromeUserManager* user_manager_ = nullptr;
diff --git a/chrome/browser/ui/browser_finder_chromeos_unittest.cc b/chrome/browser/ui/browser_finder_chromeos_unittest.cc
index 48c4de3b..65519ca 100644
--- a/chrome/browser/ui/browser_finder_chromeos_unittest.cc
+++ b/chrome/browser/ui/browser_finder_chromeos_unittest.cc
@@ -5,8 +5,8 @@
#include "chrome/browser/ui/browser_finder.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
@@ -16,6 +16,7 @@
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile_manager.h"
#include "components/signin/core/account_id/account_id.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "components/user_manager/user.h"
namespace test {
@@ -32,7 +33,7 @@
BrowserFinderChromeOSTest()
: multi_user_window_manager_(nullptr),
fake_user_manager_(new chromeos::FakeChromeUserManager),
- user_manager_enabler_(fake_user_manager_) {}
+ user_manager_enabler_(base::WrapUnique(fake_user_manager_)) {}
TestingProfile* CreateMultiUserProfile(const AccountId& account_id) {
TestingProfile* profile =
@@ -97,7 +98,7 @@
// |fake_user_manager_| is owned by |user_manager_enabler_|
chromeos::FakeChromeUserManager* fake_user_manager_;
- chromeos::ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
DISALLOW_COPY_AND_ASSIGN(BrowserFinderChromeOSTest);
};
diff --git a/chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler_unittest.cc b/chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler_unittest.cc
index 00bdcd4..266e5347 100644
--- a/chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler_unittest.cc
+++ b/chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler_unittest.cc
@@ -12,7 +12,6 @@
#include "chrome/browser/chromeos/arc/arc_migration_constants.h"
#include "chrome/browser/chromeos/login/screens/encryption_migration_mode.h"
#include "chrome/browser/chromeos/login/users/mock_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler.h"
#include "chromeos/cryptohome/homedir_methods.h"
#include "chromeos/cryptohome/mock_async_method_caller.h"
@@ -24,6 +23,7 @@
#include "chromeos/login/auth/key.h"
#include "chromeos/login/auth/user_context.h"
#include "components/signin/core/account_id/account_id.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "components/user_manager/user_names.h"
#include "content/public/test/test_web_ui.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -119,7 +119,8 @@
// Set up a MockUserManager.
MockUserManager* mock_user_manager = new NiceMock<MockUserManager>();
scoped_user_manager_enabler_ =
- base::MakeUnique<ScopedUserManagerEnabler>(mock_user_manager);
+ std::make_unique<user_manager::ScopedUserManager>(
+ base::WrapUnique(mock_user_manager));
// This is used by EncryptionMigrationScreenHandler to mount the existing
// cryptohome. Ownership of mock_homedir_methods_ is transferred to
@@ -219,7 +220,7 @@
// Must be the first member.
base::test::ScopedTaskEnvironment scoped_task_environment_;
- std::unique_ptr<ScopedUserManagerEnabler> scoped_user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> scoped_user_manager_enabler_;
cryptohome::MockHomedirMethods* mock_homedir_methods_ = nullptr;
FakeCryptohomeClient* fake_cryptohome_client_ = nullptr;
cryptohome::MockAsyncMethodCaller* mock_async_method_caller_ = nullptr;
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc b/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc
index 3199189..7c91558 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc
@@ -7,16 +7,17 @@
#include "ash/test/ash_test_base.h"
#include "base/compiler_specific.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "chrome/browser/chromeos/login/screens/user_selection_screen.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
#include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
#include "chrome/browser/chromeos/login/users/multi_profile_user_controller_delegate.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile_manager.h"
#include "components/proximity_auth/screenlock_bridge.h"
#include "components/signin/core/account_id/account_id.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "components/user_manager/user.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -41,7 +42,7 @@
public:
SigninPrepareUserListTest()
: fake_user_manager_(new FakeChromeUserManager()),
- user_manager_enabler_(fake_user_manager_) {}
+ user_manager_enabler_(base::WrapUnique(fake_user_manager_)) {}
~SigninPrepareUserListTest() override {}
@@ -77,7 +78,7 @@
void OnUserNotAllowed(const std::string& user_email) override {}
FakeChromeUserManager* fake_user_manager_;
- ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
std::unique_ptr<TestingProfileManager> profile_manager_;
std::map<std::string, proximity_auth::mojom::AuthType> user_auth_type_map;
std::unique_ptr<MultiProfileUserController> controller_;
diff --git a/chrome/browser/ui/webui/help/version_updater_chromeos_unittest.cc b/chrome/browser/ui/webui/help/version_updater_chromeos_unittest.cc
index a327c58..2e47406 100644
--- a/chrome/browser/ui/webui/help/version_updater_chromeos_unittest.cc
+++ b/chrome/browser/ui/webui/help/version_updater_chromeos_unittest.cc
@@ -9,15 +9,16 @@
#include "base/bind.h"
#include "base/compiler_specific.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "chrome/browser/chromeos/login/users/mock_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/chromeos/settings/device_settings_service.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/fake_update_engine_client.h"
#include "chromeos/dbus/shill_service_client.h"
#include "chromeos/network/network_handler.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -44,7 +45,7 @@
: version_updater_(VersionUpdater::Create(nullptr)),
fake_update_engine_client_(NULL),
mock_user_manager_(new MockUserManager()),
- user_manager_enabler_(mock_user_manager_) {}
+ user_manager_enabler_(base::WrapUnique(mock_user_manager_)) {}
~VersionUpdaterCrosTest() override {}
@@ -100,7 +101,7 @@
FakeUpdateEngineClient* fake_update_engine_client_; // Not owned.
MockUserManager* mock_user_manager_; // Not owned.
- ScopedUserManagerEnabler user_manager_enabler_;
+ user_manager::ScopedUserManager user_manager_enabler_;
DISALLOW_COPY_AND_ASSIGN(VersionUpdaterCrosTest);
};
diff --git a/chrome/browser/ui/webui/settings/on_startup_handler_unittest.cc b/chrome/browser/ui/webui/settings/on_startup_handler_unittest.cc
index 380a7165..6a2dd31 100644
--- a/chrome/browser/ui/webui/settings/on_startup_handler_unittest.cc
+++ b/chrome/browser/ui/webui/settings/on_startup_handler_unittest.cc
@@ -7,11 +7,12 @@
#include <string>
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "build/build_config.h"
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
+#include "components/user_manager/scoped_user_manager.h"
#endif
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
@@ -48,8 +49,8 @@
#if defined(OS_CHROMEOS)
chromeos::FakeChromeUserManager* fake_user_manager =
new chromeos::FakeChromeUserManager;
- user_manager_enabler_.reset(
- new chromeos::ScopedUserManagerEnabler(fake_user_manager));
+ user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
+ base::WrapUnique(fake_user_manager));
constexpr char kFakeEmail[] = "[email protected]";
profile_ = profile_manager_.CreateTestingProfile(kFakeEmail);
fake_user_manager->AddUser(AccountId::FromUserEmail(kFakeEmail));
@@ -71,7 +72,7 @@
std::unique_ptr<TestOnStartupHandler> handler_;
Profile* profile_;
#if defined(OS_CHROMEOS)
- std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
#endif
content::TestWebUI web_ui_;
};
diff --git a/chrome/browser/ui/webui/settings/profile_info_handler_unittest.cc b/chrome/browser/ui/webui/settings/profile_info_handler_unittest.cc
index a002473f..242ff4b 100644
--- a/chrome/browser/ui/webui/settings/profile_info_handler_unittest.cc
+++ b/chrome/browser/ui/webui/settings/profile_info_handler_unittest.cc
@@ -24,7 +24,7 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
+#include "components/user_manager/scoped_user_manager.h"
#endif
namespace settings {
@@ -58,8 +58,8 @@
#if defined(OS_CHROMEOS)
chromeos::FakeChromeUserManager* fake_user_manager =
new chromeos::FakeChromeUserManager;
- user_manager_enabler_.reset(
- new chromeos::ScopedUserManagerEnabler(fake_user_manager));
+ user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
+ base::WrapUnique(fake_user_manager));
profile_ = profile_manager_.CreateTestingProfile(fake_email);
fake_user_manager->AddUser(AccountId::FromUserEmail(fake_email));
#else
@@ -106,7 +106,7 @@
content::TestWebUI web_ui_;
#if defined(OS_CHROMEOS)
- std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
#endif
Profile* profile_;
diff --git a/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc b/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc
index 190db58..12c402e 100644
--- a/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc
+++ b/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc
@@ -35,7 +35,7 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/login/users/mock_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
+#include "components/user_manager/scoped_user_manager.h"
#endif
namespace {
@@ -92,9 +92,8 @@
CONTENT_SETTINGS_TYPE_COOKIES)),
handler_(&profile_) {
#if defined(OS_CHROMEOS)
- mock_user_manager_ = new chromeos::MockUserManager;
- user_manager_enabler_.reset(
- new chromeos::ScopedUserManagerEnabler(mock_user_manager_));
+ user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>(
+ std::make_unique<chromeos::MockUserManager>());
#endif
}
@@ -286,8 +285,7 @@
content::TestWebUI web_ui_;
SiteSettingsHandler handler_;
#if defined(OS_CHROMEOS)
- chromeos::MockUserManager* mock_user_manager_; // Not owned.
- std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
#endif
};
diff --git a/components/arc/arc_util_unittest.cc b/components/arc/arc_util_unittest.cc
index be1a6c5..486d81d5 100644
--- a/components/arc/arc_util_unittest.cc
+++ b/components/arc/arc_util_unittest.cc
@@ -10,9 +10,11 @@
#include "ash/public/cpp/app_types.h"
#include "base/command_line.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/test/scoped_feature_list.h"
#include "components/signin/core/account_id/account_id.h"
#include "components/user_manager/fake_user_manager.h"
+#include "components/user_manager/scoped_user_manager.h"
#include "components/user_manager/user.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/aura/client/aura_constants.h"
@@ -41,27 +43,6 @@
DISALLOW_COPY_AND_ASSIGN(ScopedArcFeature);
};
-// Helper to enable user_manager::FakeUserManager while it is in scope.
-// TODO(xiyuan): Remove after ScopedUserManagerEnabler is moved to user_manager.
-class ScopedUserManager {
- public:
- explicit ScopedUserManager(user_manager::UserManager* user_manager)
- : user_manager_(user_manager) {
- DCHECK(!user_manager::UserManager::IsInitialized());
- user_manager->Initialize();
- }
- ~ScopedUserManager() {
- DCHECK_EQ(user_manager::UserManager::Get(), user_manager_);
- user_manager_->Shutdown();
- user_manager_->Destroy();
- }
-
- private:
- user_manager::UserManager* const user_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedUserManager);
-};
-
// Fake user that can be created with a specified type.
class FakeUser : public user_manager::User {
public:
@@ -202,8 +183,10 @@
}
TEST_F(ArcUtilTest, IsArcAllowedForUser) {
- user_manager::FakeUserManager fake_user_manager;
- ScopedUserManager scoped_user_manager(&fake_user_manager);
+ user_manager::FakeUserManager* fake_user_manager =
+ new user_manager::FakeUserManager();
+ user_manager::ScopedUserManager scoped_user_manager(
+ base::WrapUnique(fake_user_manager));
struct {
user_manager::UserType user_type;
@@ -226,12 +209,12 @@
// An ephemeral user is a logged in user but unknown to UserManager when
// ephemeral policy is set.
- fake_user_manager.SetEphemeralUsersEnabled(true);
- fake_user_manager.UserLoggedIn(AccountId::FromUserEmail("[email protected]"),
- "[email protected]", false);
- const user_manager::User* ephemeral_user = fake_user_manager.GetActiveUser();
+ fake_user_manager->SetEphemeralUsersEnabled(true);
+ fake_user_manager->UserLoggedIn(AccountId::FromUserEmail("[email protected]"),
+ "[email protected]", false);
+ const user_manager::User* ephemeral_user = fake_user_manager->GetActiveUser();
ASSERT_TRUE(ephemeral_user);
- ASSERT_TRUE(fake_user_manager.IsUserCryptohomeDataEphemeral(
+ ASSERT_TRUE(fake_user_manager->IsUserCryptohomeDataEphemeral(
ephemeral_user->GetAccountId()));
// Ephemeral user is not allowed for ARC.
diff --git a/components/user_manager/BUILD.gn b/components/user_manager/BUILD.gn
index 00fe3d0a..4b8e1b6 100644
--- a/components/user_manager/BUILD.gn
+++ b/components/user_manager/BUILD.gn
@@ -29,6 +29,8 @@
"known_user.cc",
"known_user.h",
"remove_user_delegate.h",
+ "scoped_user_manager.cc",
+ "scoped_user_manager.h",
"user.cc",
"user.h",
"user_image/user_image.cc",
diff --git a/components/user_manager/scoped_user_manager.cc b/components/user_manager/scoped_user_manager.cc
new file mode 100644
index 0000000..b9a1b1f
--- /dev/null
+++ b/components/user_manager/scoped_user_manager.cc
@@ -0,0 +1,32 @@
+// Copyright 2014 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 "components/user_manager/scoped_user_manager.h"
+
+#include <utility>
+
+#include "base/logging.h"
+#include "components/user_manager/user_manager.h"
+
+namespace user_manager {
+
+ScopedUserManager::ScopedUserManager(std::unique_ptr<UserManager> user_manager)
+ : user_manager_(std::move(user_manager)) {
+ if (UserManager::GetForTesting())
+ UserManager::GetForTesting()->Shutdown();
+
+ previous_user_manager_ = UserManager::SetForTesting(user_manager_.get());
+}
+
+ScopedUserManager::~ScopedUserManager() {
+ DCHECK_EQ(UserManager::Get(), user_manager_.get());
+
+ // Shutdown and destroy current UserManager instance that we track.
+ UserManager::Get()->Shutdown();
+ UserManager::Get()->Destroy();
+
+ UserManager::SetForTesting(previous_user_manager_);
+}
+
+} // namespace user_manager
diff --git a/components/user_manager/scoped_user_manager.h b/components/user_manager/scoped_user_manager.h
new file mode 100644
index 0000000..41f61f1c
--- /dev/null
+++ b/components/user_manager/scoped_user_manager.h
@@ -0,0 +1,35 @@
+// Copyright 2014 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.
+
+#ifndef COMPONENTS_USER_MANAGER_SCOPED_USER_MANAGER_H_
+#define COMPONENTS_USER_MANAGER_SCOPED_USER_MANAGER_H_
+
+#include <memory>
+
+#include "base/macros.h"
+#include "components/user_manager/user_manager_export.h"
+
+namespace user_manager {
+
+class UserManager;
+
+// Helper class for unit tests. Initializes the UserManager singleton to the
+// given |user_manager| and tears it down again on destruction. If the singleton
+// had already been initialized, its previous value is restored after tearing
+// down |user_manager|.
+class USER_MANAGER_EXPORT ScopedUserManager {
+ public:
+ explicit ScopedUserManager(std::unique_ptr<UserManager> user_manager);
+ ~ScopedUserManager();
+
+ private:
+ const std::unique_ptr<UserManager> user_manager_;
+ UserManager* previous_user_manager_ = nullptr;
+
+ DISALLOW_COPY_AND_ASSIGN(ScopedUserManager);
+};
+
+} // namespace user_manager
+
+#endif // COMPONENTS_USER_MANAGER_SCOPED_USER_MANAGER_H_
diff --git a/components/user_manager/user_manager.h b/components/user_manager/user_manager.h
index be6bcfd..1ac3fb250 100644
--- a/components/user_manager/user_manager.h
+++ b/components/user_manager/user_manager.h
@@ -17,12 +17,9 @@
class AccountId;
class PrefService;
-namespace chromeos {
-class ScopedUserManagerEnabler;
-}
-
namespace user_manager {
+class ScopedUserManager;
class RemoveUserDelegate;
// Interface for UserManagerBase - that provides base implementation for
@@ -414,7 +411,7 @@
static UserManager* instance;
private:
- friend class chromeos::ScopedUserManagerEnabler;
+ friend class ScopedUserManager;
// Same as Get() but doesn't won't crash is current instance is NULL.
static UserManager* GetForTesting();
diff --git a/components/user_manager/user_names.h b/components/user_manager/user_names.h
index d56880a83..895b144 100644
--- a/components/user_manager/user_names.h
+++ b/components/user_manager/user_names.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROMEOS_LOGIN_USER_NAMES_H_
-#define CHROMEOS_LOGIN_USER_NAMES_H_
+#ifndef COMPONENTS_USER_MANAGER_USER_NAMES_H_
+#define COMPONENTS_USER_MANAGER_USER_NAMES_H_
#include <string>
@@ -46,4 +46,4 @@
} // namespace user_manager
-#endif // CHROMEOS_LOGIN_USER_NAMES_H_
+#endif // COMPONENTS_USER_MANAGER_USER_NAMES_H_
