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/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_;
