| Index: chrome/browser/chromeos/policy/device_local_account_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
|
| index 992030ca2269e718a9698e014988e335ae312567..bcbda4fa76c65da2351b9879d5fc6af4e8d9bf8a 100644
|
| --- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
|
| +++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
|
| @@ -416,7 +416,7 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest,
|
| }
|
|
|
| void CheckPublicSessionPresent(const std::string& id) {
|
| - const chromeos::User* user = chromeos::UserManager::Get()->FindUser(id);
|
| + const chromeos::User* user = chromeos::GetUserManager()->FindUser(id);
|
| ASSERT_TRUE(user);
|
| EXPECT_EQ(id, user->email());
|
| EXPECT_EQ(user_manager::USER_TYPE_PUBLIC_ACCOUNT, user->GetType());
|
| @@ -459,7 +459,7 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest,
|
| };
|
|
|
| static bool IsKnownUser(const std::string& account_id) {
|
| - return chromeos::UserManager::Get()->IsKnownUser(account_id);
|
| + return chromeos::GetUserManager()->IsKnownUser(account_id);
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, LoginScreen) {
|
| @@ -479,8 +479,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, LoginScreen) {
|
|
|
| static bool DisplayNameMatches(const std::string& account_id,
|
| const std::string& display_name) {
|
| - const chromeos::User* user =
|
| - chromeos::UserManager::Get()->FindUser(account_id);
|
| + const chromeos::User* user = chromeos::GetUserManager()->FindUser(account_id);
|
| if (!user || user->display_name().empty())
|
| return false;
|
| EXPECT_EQ(base::UTF8ToUTF16(display_name), user->display_name());
|
| @@ -552,7 +551,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DevicePolicyChange) {
|
| }
|
|
|
| static bool IsSessionStarted() {
|
| - return chromeos::UserManager::Get()->IsSessionStarted();
|
| + return chromeos::GetUserManager()->IsSessionStarted();
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, StartSession) {
|
| @@ -857,8 +856,8 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, ExternalData) {
|
| // verify that the underlying policy subsystem will start a fetch
|
| // without this request as well, the chromeos::UserManager must be
|
| // prevented from seeing the policy change.
|
| - reinterpret_cast<chromeos::UserManagerImpl*>(chromeos::UserManager::Get())->
|
| - StopPolicyObserverForTesting();
|
| + reinterpret_cast<chromeos::UserManagerImpl*>(chromeos::GetUserManager())
|
| + ->StopPolicyObserverForTesting();
|
|
|
| UploadDeviceLocalAccountPolicy();
|
| AddPublicSessionToDevicePolicy(kAccountId1);
|
| @@ -1009,17 +1008,16 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, UserAvatarImage) {
|
| ASSERT_TRUE(broker);
|
|
|
| run_loop_.reset(new base::RunLoop);
|
| - chromeos::UserManager::Get()->AddObserver(this);
|
| + chromeos::GetUserManager()->AddObserver(this);
|
| broker->core()->store()->Load();
|
| run_loop_->Run();
|
| - chromeos::UserManager::Get()->RemoveObserver(this);
|
| + chromeos::GetUserManager()->RemoveObserver(this);
|
|
|
| scoped_ptr<gfx::ImageSkia> policy_image = chromeos::test::ImageLoader(
|
| test_dir.Append(chromeos::test::kUserAvatarImage1RelativePath)).Load();
|
| ASSERT_TRUE(policy_image);
|
|
|
| - const chromeos::User* user =
|
| - chromeos::UserManager::Get()->FindUser(user_id_1_);
|
| + const chromeos::User* user = chromeos::GetUserManager()->FindUser(user_id_1_);
|
| ASSERT_TRUE(user);
|
|
|
| base::FilePath user_data_dir;
|
|
|