Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4646)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc

Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/login/user_flow.cc ('k') | chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc
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 0be1fbc2b1c151850bc1fee69063ac217ceb5325..ae96cf5d6572673f4c040510a8a66c5f0252a57b 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
@@ -112,11 +112,11 @@ class UserImageManagerTest : public LoginManagerTest,
virtual void SetUpOnMainThread() OVERRIDE {
LoginManagerTest::SetUpOnMainThread();
local_state_ = g_browser_process->local_state();
- UserManager::Get()->AddObserver(this);
+ GetUserManager()->AddObserver(this);
}
virtual void TearDownOnMainThread() OVERRIDE {
- UserManager::Get()->RemoveObserver(this);
+ GetUserManager()->RemoveObserver(this);
LoginManagerTest::TearDownOnMainThread();
}
@@ -128,7 +128,7 @@ class UserImageManagerTest : public LoginManagerTest,
// Logs in |username|.
void LogIn(const std::string& username) {
- UserManager::Get()->UserLoggedIn(username, username, false);
+ GetUserManager()->UserLoggedIn(username, username, false);
}
// Stores old (pre-migration) user image info.
@@ -225,8 +225,8 @@ class UserImageManagerTest : public LoginManagerTest,
net::TestURLFetcherFactory* url_fetcher_factory) {
ProfileDownloader* profile_downloader =
reinterpret_cast<UserImageManagerImpl*>(
- UserManager::Get()->GetUserImageManager(username))->
- profile_downloader_.get();
+ GetUserManager()->GetUserImageManager(username))
+ ->profile_downloader_.get();
ASSERT_TRUE(profile_downloader);
static_cast<OAuth2TokenService::Consumer*>(profile_downloader)->
@@ -274,10 +274,10 @@ class UserImageManagerTest : public LoginManagerTest,
fetcher->delegate()->OnURLFetchComplete(fetcher);
run_loop.Run();
- const User* user = UserManager::Get()->GetLoggedInUser();
+ const User* user = GetUserManager()->GetLoggedInUser();
ASSERT_TRUE(user);
UserImageManagerImpl* uim = reinterpret_cast<UserImageManagerImpl*>(
- UserManager::Get()->GetUserImageManager(user->email()));
+ GetUserManager()->GetUserImageManager(user->email()));
if (uim->job_.get()) {
run_loop_.reset(new base::RunLoop);
run_loop_->Run();
@@ -304,7 +304,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_DefaultUserImagePreserved) {
}
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, DefaultUserImagePreserved) {
- UserManager::Get()->GetUsers(); // Load users.
+ GetUserManager()->GetUsers(); // Load users.
// Old info preserved.
ExpectOldUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
LogIn(kTestUser1);
@@ -321,7 +321,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_OtherUsersUnaffected) {
}
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, OtherUsersUnaffected) {
- UserManager::Get()->GetUsers(); // Load users.
+ GetUserManager()->GetUsers(); // Load users.
// Old info preserved.
ExpectOldUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
ExpectOldUserImageInfo(kTestUser2, kFirstDefaultImageIndex + 1,
@@ -341,11 +341,11 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_PRE_NonJPEGImageFromFile) {
}
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_NonJPEGImageFromFile) {
- UserManager::Get()->GetUsers(); // Load users.
+ GetUserManager()->GetUsers(); // Load users.
// Old info preserved.
ExpectOldUserImageInfo(kTestUser1, User::kExternalImageIndex,
GetUserImagePath(kTestUser1, "png"));
- const User* user = UserManager::Get()->FindUser(kTestUser1);
+ const User* user = GetUserManager()->FindUser(kTestUser1);
EXPECT_TRUE(user->image_is_stub());
base::RunLoop run_loop;
@@ -360,7 +360,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_NonJPEGImageFromFile) {
// Image info is migrated and the image is converted to JPG.
ExpectNewUserImageInfo(kTestUser1, User::kExternalImageIndex,
GetUserImagePath(kTestUser1, "jpg"));
- user = UserManager::Get()->GetLoggedInUser();
+ user = GetUserManager()->GetLoggedInUser();
ASSERT_TRUE(user);
EXPECT_FALSE(user->image_is_safe_format());
// Check image dimensions.
@@ -370,8 +370,8 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_NonJPEGImageFromFile) {
}
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, NonJPEGImageFromFile) {
- UserManager::Get()->GetUsers(); // Load users.
- const User* user = UserManager::Get()->FindUser(kTestUser1);
+ GetUserManager()->GetUsers(); // Load users.
+ const User* user = GetUserManager()->FindUser(kTestUser1);
ASSERT_TRUE(user);
// Wait for image load.
if (user->image_index() == User::kInvalidImageIndex) {
@@ -394,14 +394,14 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_SaveUserDefaultImageIndex) {
// Verifies that SaveUserDefaultImageIndex() correctly sets and persists the
// chosen user image.
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserDefaultImageIndex) {
- const User* user = UserManager::Get()->FindUser(kTestUser1);
+ const User* user = GetUserManager()->FindUser(kTestUser1);
ASSERT_TRUE(user);
const gfx::ImageSkia& default_image =
GetDefaultImage(kFirstDefaultImageIndex);
UserImageManager* user_image_manager =
- UserManager::Get()->GetUserImageManager(kTestUser1);
+ GetUserManager()->GetUserImageManager(kTestUser1);
user_image_manager->SaveUserDefaultImageIndex(kFirstDefaultImageIndex);
EXPECT_TRUE(user->HasDefaultImage());
@@ -417,7 +417,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_SaveUserImage) {
// Verifies that SaveUserImage() correctly sets and persists the chosen user
// image.
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserImage) {
- const User* user = UserManager::Get()->FindUser(kTestUser1);
+ const User* user = GetUserManager()->FindUser(kTestUser1);
ASSERT_TRUE(user);
SkBitmap custom_image_bitmap;
@@ -428,7 +428,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserImage) {
run_loop_.reset(new base::RunLoop);
UserImageManager* user_image_manager =
- UserManager::Get()->GetUserImageManager(kTestUser1);
+ GetUserManager()->GetUserImageManager(kTestUser1);
user_image_manager->SaveUserImage(UserImage::CreateAndEncode(custom_image));
run_loop_->Run();
@@ -455,7 +455,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_SaveUserImageFromFile) {
// Verifies that SaveUserImageFromFile() correctly sets and persists the chosen
// user image.
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserImageFromFile) {
- const User* user = UserManager::Get()->FindUser(kTestUser1);
+ const User* user = GetUserManager()->FindUser(kTestUser1);
ASSERT_TRUE(user);
const base::FilePath custom_image_path =
@@ -466,7 +466,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserImageFromFile) {
run_loop_.reset(new base::RunLoop);
UserImageManager* user_image_manager =
- UserManager::Get()->GetUserImageManager(kTestUser1);
+ GetUserManager()->GetUserImageManager(kTestUser1);
user_image_manager->SaveUserImageFromFile(custom_image_path);
run_loop_->Run();
@@ -495,7 +495,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest,
// Verifies that SaveUserImageFromProfileImage() correctly downloads, sets and
// persists the chosen user image.
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserImageFromProfileImage) {
- const User* user = UserManager::Get()->FindUser(kTestUser1);
+ const User* user = GetUserManager()->FindUser(kTestUser1);
ASSERT_TRUE(user);
UserImageManagerImpl::IgnoreProfileDataDownloadDelayForTesting();
@@ -503,7 +503,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserImageFromProfileImage) {
run_loop_.reset(new base::RunLoop);
UserImageManager* user_image_manager =
- UserManager::Get()->GetUserImageManager(kTestUser1);
+ GetUserManager()->GetUserImageManager(kTestUser1);
user_image_manager->SaveUserImageFromProfileImage();
run_loop_->Run();
@@ -542,7 +542,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest,
// clobber the default image chosen in the meantime.
IN_PROC_BROWSER_TEST_F(UserImageManagerTest,
ProfileImageDownloadDoesNotClobber) {
- const User* user = UserManager::Get()->FindUser(kTestUser1);
+ const User* user = GetUserManager()->FindUser(kTestUser1);
ASSERT_TRUE(user);
const gfx::ImageSkia& default_image =
@@ -553,7 +553,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest,
run_loop_.reset(new base::RunLoop);
UserImageManager* user_image_manager =
- UserManager::Get()->GetUserImageManager(kTestUser1);
+ GetUserManager()->GetUserImageManager(kTestUser1);
user_image_manager->SaveUserImageFromProfileImage();
run_loop_->Run();
@@ -659,7 +659,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, PRE_SetAndClear) {
// after the policy has been cleared, the user is able to choose a different
// image.
IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, SetAndClear) {
- const User* user = UserManager::Get()->FindUser(kTestUser1);
+ const User* user = GetUserManager()->FindUser(kTestUser1);
ASSERT_TRUE(user);
LoginUser(kTestUser1);
@@ -722,7 +722,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, SetAndClear) {
const gfx::ImageSkia& user_image = GetDefaultImage(user_image_index);
UserImageManager* user_image_manager =
- UserManager::Get()->GetUserImageManager(kTestUser1);
+ GetUserManager()->GetUserImageManager(kTestUser1);
user_image_manager->SaveUserDefaultImageIndex(user_image_index);
EXPECT_TRUE(user->HasDefaultImage());
@@ -740,7 +740,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, PRE_PolicyOverridesUser) {
// then set through policy, the policy takes precedence, overriding the
// previously chosen image.
IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, PolicyOverridesUser) {
- const User* user = UserManager::Get()->FindUser(kTestUser1);
+ const User* user = GetUserManager()->FindUser(kTestUser1);
ASSERT_TRUE(user);
LoginUser(kTestUser1);
@@ -755,7 +755,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, PolicyOverridesUser) {
GetDefaultImage(kFirstDefaultImageIndex);
UserImageManager* user_image_manager =
- UserManager::Get()->GetUserImageManager(kTestUser1);
+ GetUserManager()->GetUserImageManager(kTestUser1);
user_image_manager->SaveUserDefaultImageIndex(kFirstDefaultImageIndex);
EXPECT_TRUE(user->HasDefaultImage());
@@ -800,7 +800,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest,
// chooses a different image, the policy takes precedence, preventing the user
// from overriding the previously chosen image.
IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, UserDoesNotOverridePolicy) {
- const User* user = UserManager::Get()->FindUser(kTestUser1);
+ const User* user = GetUserManager()->FindUser(kTestUser1);
ASSERT_TRUE(user);
LoginUser(kTestUser1);
@@ -838,7 +838,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, UserDoesNotOverridePolicy) {
// Choose a different user image. Verify that the user image does not change
// as policy takes precedence.
UserImageManager* user_image_manager =
- UserManager::Get()->GetUserImageManager(kTestUser1);
+ GetUserManager()->GetUserImageManager(kTestUser1);
user_image_manager->SaveUserDefaultImageIndex(kFirstDefaultImageIndex);
EXPECT_FALSE(user->HasDefaultImage());
« no previous file with comments | « chrome/browser/chromeos/login/user_flow.cc ('k') | chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698