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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 402133003: [cros, user_manager] Move default user images constants and helper functions out of src/chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: re-format 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/users/avatar/default_user_images.cc ('k') | chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.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 9f1105ff9722ef22a92b0c3c0c4c2ae5c9d1959e..30a0145f5c34d4f3c95fe5dda6736876ca4c337a 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
@@ -27,7 +27,6 @@
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/chromeos/login/login_manager_test.h"
#include "chrome/browser/chromeos/login/startup_utils.h"
-#include "chrome/browser/chromeos/login/users/avatar/default_user_images.h"
#include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
#include "chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h"
#include "chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.h"
@@ -52,6 +51,7 @@
#include "components/policy/core/common/cloud/cloud_policy_core.h"
#include "components/policy/core/common/cloud/cloud_policy_store.h"
#include "components/policy/core/common/cloud/policy_builder.h"
+#include "components/user_manager/user_image/default_user_images.h"
#include "components/user_manager/user_image/user_image.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_source.h"
@@ -300,44 +300,51 @@ class UserImageManagerTest : public LoginManagerTest,
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_DefaultUserImagePreserved) {
// Setup an old default (stock) user image.
ScopedUserManagerEnabler(new MockUserManager);
- SetOldUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
+ SetOldUserImageInfo(
+ kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
}
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, DefaultUserImagePreserved) {
UserManager::Get()->GetUsers(); // Load users.
// Old info preserved.
- ExpectOldUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
+ ExpectOldUserImageInfo(
+ kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
LogIn(kTestUser1);
// Image info is migrated now.
- ExpectNewUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
+ ExpectNewUserImageInfo(
+ kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
}
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_OtherUsersUnaffected) {
// Setup two users with stock images.
ScopedUserManagerEnabler(new MockUserManager);
- SetOldUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
- SetOldUserImageInfo(kTestUser2, kFirstDefaultImageIndex + 1,
- base::FilePath());
+ SetOldUserImageInfo(
+ kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
+ SetOldUserImageInfo(
+ kTestUser2, user_manager::kFirstDefaultImageIndex + 1, base::FilePath());
}
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, OtherUsersUnaffected) {
UserManager::Get()->GetUsers(); // Load users.
// Old info preserved.
- ExpectOldUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
- ExpectOldUserImageInfo(kTestUser2, kFirstDefaultImageIndex + 1,
- base::FilePath());
+ ExpectOldUserImageInfo(
+ kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
+ ExpectOldUserImageInfo(
+ kTestUser2, user_manager::kFirstDefaultImageIndex + 1, base::FilePath());
LogIn(kTestUser1);
// Image info is migrated for the first user and unaffected for the rest.
- ExpectNewUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
- ExpectOldUserImageInfo(kTestUser2, kFirstDefaultImageIndex + 1,
- base::FilePath());
+ ExpectNewUserImageInfo(
+ kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
+ ExpectOldUserImageInfo(
+ kTestUser2, user_manager::kFirstDefaultImageIndex + 1, base::FilePath());
}
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_PRE_NonJPEGImageFromFile) {
// Setup a user with non-JPEG image.
ScopedUserManagerEnabler(new MockUserManager);
- SaveUserImagePNG(
- kTestUser1, kDefaultImageResourceIDs[kFirstDefaultImageIndex]);
+ SaveUserImagePNG(kTestUser1,
+ user_manager::kDefaultImageResourceIDs
+ [user_manager::kFirstDefaultImageIndex]);
}
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_NonJPEGImageFromFile) {
@@ -364,7 +371,8 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_NonJPEGImageFromFile) {
ASSERT_TRUE(user);
EXPECT_FALSE(user->image_is_safe_format());
// Check image dimensions.
- const gfx::ImageSkia& saved_image = GetDefaultImage(kFirstDefaultImageIndex);
+ const gfx::ImageSkia& saved_image =
+ user_manager::GetDefaultImage(user_manager::kFirstDefaultImageIndex);
EXPECT_EQ(saved_image.width(), user->GetImage().width());
EXPECT_EQ(saved_image.height(), user->GetImage().height());
}
@@ -382,7 +390,8 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, NonJPEGImageFromFile) {
// Now the migrated image is used.
EXPECT_TRUE(user->image_is_safe_format());
// Check image dimensions. Images can't be compared since JPEG is lossy.
- const gfx::ImageSkia& saved_image = GetDefaultImage(kFirstDefaultImageIndex);
+ const gfx::ImageSkia& saved_image =
+ user_manager::GetDefaultImage(user_manager::kFirstDefaultImageIndex);
EXPECT_EQ(saved_image.width(), user->GetImage().width());
EXPECT_EQ(saved_image.height(), user->GetImage().height());
}
@@ -398,16 +407,18 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserDefaultImageIndex) {
ASSERT_TRUE(user);
const gfx::ImageSkia& default_image =
- GetDefaultImage(kFirstDefaultImageIndex);
+ user_manager::GetDefaultImage(user_manager::kFirstDefaultImageIndex);
UserImageManager* user_image_manager =
UserManager::Get()->GetUserImageManager(kTestUser1);
- user_image_manager->SaveUserDefaultImageIndex(kFirstDefaultImageIndex);
+ user_image_manager->SaveUserDefaultImageIndex(
+ user_manager::kFirstDefaultImageIndex);
EXPECT_TRUE(user->HasDefaultImage());
- EXPECT_EQ(kFirstDefaultImageIndex, user->image_index());
+ EXPECT_EQ(user_manager::kFirstDefaultImageIndex, user->image_index());
EXPECT_TRUE(test::AreImagesEqual(default_image, user->GetImage()));
- ExpectNewUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
+ ExpectNewUserImageInfo(
+ kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
}
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_SaveUserImage) {
@@ -547,7 +558,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest,
ASSERT_TRUE(user);
const gfx::ImageSkia& default_image =
- GetDefaultImage(kFirstDefaultImageIndex);
+ user_manager::GetDefaultImage(user_manager::kFirstDefaultImageIndex);
UserImageManagerImpl::IgnoreProfileDataDownloadDelayForTesting();
LoginUser(kTestUser1);
@@ -561,14 +572,16 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest,
net::TestURLFetcherFactory url_fetcher_factory;
CompleteProfileMetadataDownload(kTestUser1, &url_fetcher_factory);
- user_image_manager->SaveUserDefaultImageIndex(kFirstDefaultImageIndex);
+ user_image_manager->SaveUserDefaultImageIndex(
+ user_manager::kFirstDefaultImageIndex);
CompleteProfileImageDownload(&url_fetcher_factory);
EXPECT_TRUE(user->HasDefaultImage());
- EXPECT_EQ(kFirstDefaultImageIndex, user->image_index());
+ EXPECT_EQ(user_manager::kFirstDefaultImageIndex, user->image_index());
EXPECT_TRUE(test::AreImagesEqual(default_image, user->GetImage()));
- ExpectNewUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
+ ExpectNewUserImageInfo(
+ kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
}
class UserImageManagerPolicyTest : public UserImageManagerTest,
@@ -710,17 +723,23 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, SetAndClear) {
const int default_image_index = user->image_index();
EXPECT_TRUE(user->HasDefaultImage());
- ASSERT_LE(kFirstDefaultImageIndex, default_image_index);
- ASSERT_GT(kFirstDefaultImageIndex + kDefaultImagesCount, default_image_index);
- const gfx::ImageSkia& default_image = GetDefaultImage(default_image_index);
+ ASSERT_LE(user_manager::kFirstDefaultImageIndex, default_image_index);
+ ASSERT_GT(
+ user_manager::kFirstDefaultImageIndex + user_manager::kDefaultImagesCount,
+ default_image_index);
+ const gfx::ImageSkia& default_image =
+ user_manager::GetDefaultImage(default_image_index);
EXPECT_TRUE(test::AreImagesEqual(default_image, user->GetImage()));
ExpectNewUserImageInfo(kTestUser1, default_image_index, base::FilePath());
// Choose a different user image. Verify that the chosen user image is set and
// persisted.
- const int user_image_index = kFirstDefaultImageIndex +
- (default_image_index - kFirstDefaultImageIndex + 1) % kDefaultImagesCount;
- const gfx::ImageSkia& user_image = GetDefaultImage(user_image_index);
+ const int user_image_index =
+ user_manager::kFirstDefaultImageIndex +
+ (default_image_index - user_manager::kFirstDefaultImageIndex + 1) %
+ user_manager::kDefaultImagesCount;
+ const gfx::ImageSkia& user_image =
+ user_manager::GetDefaultImage(user_image_index);
UserImageManager* user_image_manager =
UserManager::Get()->GetUserImageManager(kTestUser1);
@@ -753,16 +772,18 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, PolicyOverridesUser) {
// Choose a user image. Verify that the chosen user image is set and
// persisted.
const gfx::ImageSkia& default_image =
- GetDefaultImage(kFirstDefaultImageIndex);
+ user_manager::GetDefaultImage(user_manager::kFirstDefaultImageIndex);
UserImageManager* user_image_manager =
UserManager::Get()->GetUserImageManager(kTestUser1);
- user_image_manager->SaveUserDefaultImageIndex(kFirstDefaultImageIndex);
+ user_image_manager->SaveUserDefaultImageIndex(
+ user_manager::kFirstDefaultImageIndex);
EXPECT_TRUE(user->HasDefaultImage());
- EXPECT_EQ(kFirstDefaultImageIndex, user->image_index());
+ EXPECT_EQ(user_manager::kFirstDefaultImageIndex, user->image_index());
EXPECT_TRUE(test::AreImagesEqual(default_image, user->GetImage()));
- ExpectNewUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
+ ExpectNewUserImageInfo(
+ kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
// Set policy. Verify that the policy-provided user image is downloaded, set
// and persisted, overriding the previously set image.
@@ -840,7 +861,8 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, UserDoesNotOverridePolicy) {
// as policy takes precedence.
UserImageManager* user_image_manager =
UserManager::Get()->GetUserImageManager(kTestUser1);
- user_image_manager->SaveUserDefaultImageIndex(kFirstDefaultImageIndex);
+ user_image_manager->SaveUserDefaultImageIndex(
+ user_manager::kFirstDefaultImageIndex);
EXPECT_FALSE(user->HasDefaultImage());
EXPECT_EQ(User::kExternalImageIndex, user->image_index());
« no previous file with comments | « chrome/browser/chromeos/login/users/avatar/default_user_images.cc ('k') | chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698