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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 408833004: Revert 284417 "Move default user profile images strings and reso..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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 | « trunk/src/chrome/browser/chromeos/login/users/avatar/default_user_images.cc ('k') | trunk/src/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: trunk/src/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc (revision 284418)
+++ trunk/src/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc (working copy)
@@ -27,6 +27,7 @@
#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"
@@ -51,7 +52,6 @@
#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,51 +300,44 @@
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_DefaultUserImagePreserved) {
// Setup an old default (stock) user image.
ScopedUserManagerEnabler(new MockUserManager);
- SetOldUserImageInfo(
- kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
+ SetOldUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
}
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, DefaultUserImagePreserved) {
UserManager::Get()->GetUsers(); // Load users.
// Old info preserved.
- ExpectOldUserImageInfo(
- kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
+ ExpectOldUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
LogIn(kTestUser1);
// Image info is migrated now.
- ExpectNewUserImageInfo(
- kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
+ ExpectNewUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
}
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_OtherUsersUnaffected) {
// Setup two users with stock images.
ScopedUserManagerEnabler(new MockUserManager);
- SetOldUserImageInfo(
- kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
- SetOldUserImageInfo(
- kTestUser2, user_manager::kFirstDefaultImageIndex + 1, base::FilePath());
+ SetOldUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
+ SetOldUserImageInfo(kTestUser2, kFirstDefaultImageIndex + 1,
+ base::FilePath());
}
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, OtherUsersUnaffected) {
UserManager::Get()->GetUsers(); // Load users.
// Old info preserved.
- ExpectOldUserImageInfo(
- kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
- ExpectOldUserImageInfo(
- kTestUser2, user_manager::kFirstDefaultImageIndex + 1, base::FilePath());
+ ExpectOldUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
+ ExpectOldUserImageInfo(kTestUser2, kFirstDefaultImageIndex + 1,
+ base::FilePath());
LogIn(kTestUser1);
// Image info is migrated for the first user and unaffected for the rest.
- ExpectNewUserImageInfo(
- kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
- ExpectOldUserImageInfo(
- kTestUser2, user_manager::kFirstDefaultImageIndex + 1, base::FilePath());
+ ExpectNewUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
+ ExpectOldUserImageInfo(kTestUser2, 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,
- user_manager::kDefaultImageResourceIDs
- [user_manager::kFirstDefaultImageIndex]);
+ SaveUserImagePNG(
+ kTestUser1, kDefaultImageResourceIDs[kFirstDefaultImageIndex]);
}
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_NonJPEGImageFromFile) {
@@ -371,8 +364,7 @@
ASSERT_TRUE(user);
EXPECT_FALSE(user->image_is_safe_format());
// Check image dimensions.
- const gfx::ImageSkia& saved_image =
- user_manager::GetDefaultImage(user_manager::kFirstDefaultImageIndex);
+ const gfx::ImageSkia& saved_image = GetDefaultImage(kFirstDefaultImageIndex);
EXPECT_EQ(saved_image.width(), user->GetImage().width());
EXPECT_EQ(saved_image.height(), user->GetImage().height());
}
@@ -390,8 +382,7 @@
// 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 =
- user_manager::GetDefaultImage(user_manager::kFirstDefaultImageIndex);
+ const gfx::ImageSkia& saved_image = GetDefaultImage(kFirstDefaultImageIndex);
EXPECT_EQ(saved_image.width(), user->GetImage().width());
EXPECT_EQ(saved_image.height(), user->GetImage().height());
}
@@ -407,18 +398,16 @@
ASSERT_TRUE(user);
const gfx::ImageSkia& default_image =
- user_manager::GetDefaultImage(user_manager::kFirstDefaultImageIndex);
+ GetDefaultImage(kFirstDefaultImageIndex);
UserImageManager* user_image_manager =
UserManager::Get()->GetUserImageManager(kTestUser1);
- user_image_manager->SaveUserDefaultImageIndex(
- user_manager::kFirstDefaultImageIndex);
+ user_image_manager->SaveUserDefaultImageIndex(kFirstDefaultImageIndex);
EXPECT_TRUE(user->HasDefaultImage());
- EXPECT_EQ(user_manager::kFirstDefaultImageIndex, user->image_index());
+ EXPECT_EQ(kFirstDefaultImageIndex, user->image_index());
EXPECT_TRUE(test::AreImagesEqual(default_image, user->GetImage()));
- ExpectNewUserImageInfo(
- kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
+ ExpectNewUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
}
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_SaveUserImage) {
@@ -558,7 +547,7 @@
ASSERT_TRUE(user);
const gfx::ImageSkia& default_image =
- user_manager::GetDefaultImage(user_manager::kFirstDefaultImageIndex);
+ GetDefaultImage(kFirstDefaultImageIndex);
UserImageManagerImpl::IgnoreProfileDataDownloadDelayForTesting();
LoginUser(kTestUser1);
@@ -572,16 +561,14 @@
net::TestURLFetcherFactory url_fetcher_factory;
CompleteProfileMetadataDownload(kTestUser1, &url_fetcher_factory);
- user_image_manager->SaveUserDefaultImageIndex(
- user_manager::kFirstDefaultImageIndex);
+ user_image_manager->SaveUserDefaultImageIndex(kFirstDefaultImageIndex);
CompleteProfileImageDownload(&url_fetcher_factory);
EXPECT_TRUE(user->HasDefaultImage());
- EXPECT_EQ(user_manager::kFirstDefaultImageIndex, user->image_index());
+ EXPECT_EQ(kFirstDefaultImageIndex, user->image_index());
EXPECT_TRUE(test::AreImagesEqual(default_image, user->GetImage()));
- ExpectNewUserImageInfo(
- kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
+ ExpectNewUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
}
class UserImageManagerPolicyTest : public UserImageManagerTest,
@@ -723,23 +710,17 @@
const int default_image_index = user->image_index();
EXPECT_TRUE(user->HasDefaultImage());
- 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);
+ ASSERT_LE(kFirstDefaultImageIndex, default_image_index);
+ ASSERT_GT(kFirstDefaultImageIndex + kDefaultImagesCount, default_image_index);
+ const gfx::ImageSkia& default_image = 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 =
- user_manager::kFirstDefaultImageIndex +
- (default_image_index - user_manager::kFirstDefaultImageIndex + 1) %
- user_manager::kDefaultImagesCount;
- const gfx::ImageSkia& user_image =
- user_manager::GetDefaultImage(user_image_index);
+ const int user_image_index = kFirstDefaultImageIndex +
+ (default_image_index - kFirstDefaultImageIndex + 1) % kDefaultImagesCount;
+ const gfx::ImageSkia& user_image = GetDefaultImage(user_image_index);
UserImageManager* user_image_manager =
UserManager::Get()->GetUserImageManager(kTestUser1);
@@ -772,18 +753,16 @@
// Choose a user image. Verify that the chosen user image is set and
// persisted.
const gfx::ImageSkia& default_image =
- user_manager::GetDefaultImage(user_manager::kFirstDefaultImageIndex);
+ GetDefaultImage(kFirstDefaultImageIndex);
UserImageManager* user_image_manager =
UserManager::Get()->GetUserImageManager(kTestUser1);
- user_image_manager->SaveUserDefaultImageIndex(
- user_manager::kFirstDefaultImageIndex);
+ user_image_manager->SaveUserDefaultImageIndex(kFirstDefaultImageIndex);
EXPECT_TRUE(user->HasDefaultImage());
- EXPECT_EQ(user_manager::kFirstDefaultImageIndex, user->image_index());
+ EXPECT_EQ(kFirstDefaultImageIndex, user->image_index());
EXPECT_TRUE(test::AreImagesEqual(default_image, user->GetImage()));
- ExpectNewUserImageInfo(
- kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
+ ExpectNewUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
// Set policy. Verify that the policy-provided user image is downloaded, set
// and persisted, overriding the previously set image.
@@ -861,8 +840,7 @@
// as policy takes precedence.
UserImageManager* user_image_manager =
UserManager::Get()->GetUserImageManager(kTestUser1);
- user_image_manager->SaveUserDefaultImageIndex(
- user_manager::kFirstDefaultImageIndex);
+ user_image_manager->SaveUserDefaultImageIndex(kFirstDefaultImageIndex);
EXPECT_FALSE(user->HasDefaultImage());
EXPECT_EQ(User::kExternalImageIndex, user->image_index());
« no previous file with comments | « trunk/src/chrome/browser/chromeos/login/users/avatar/default_user_images.cc ('k') | trunk/src/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