Add support for transparent/translucent pixels in the user image

chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
@@ skipping 288 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_SaveAndLoadUserImage) {
   RegisterUser(test_account_id1_.GetUserEmail());
 
   // Setup a user with JPEG image.
   run_loop_.reset(new base::RunLoop);
   const gfx::ImageSkia& image = default_user_image::GetDefaultImage(
       default_user_image::kFirstDefaultImageIndex);
   UserImageManager* user_image_manager =
       ChromeUserManager::Get()->GetUserImageManager(test_account_id1_);
-  user_image_manager->SaveUserImage(
-      user_manager::UserImage::CreateAndEncode(image));
+  user_image_manager->SaveUserImage(user_manager::UserImage::CreateAndEncode(
+      image, user_manager::UserImage::FORMAT_JPEG));
   run_loop_->Run();
 }
 
 // Ensures that the user image in JPEG format is loaded correctly.
 IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveAndLoadUserImage) {
   user_manager::UserManager::Get()->GetUsers();  // Load users.
   const user_manager::User* user =
       user_manager::UserManager::Get()->FindUser(test_account_id1_);
   ASSERT_TRUE(user);
   // Wait for image load.
@@ skipping 52 matching lines @@
   SkBitmap custom_image_bitmap;
   custom_image_bitmap.allocN32Pixels(10, 10);
   custom_image_bitmap.eraseColor(SK_ColorWHITE);
   custom_image_bitmap.setImmutable();
   const gfx::ImageSkia custom_image =
       gfx::ImageSkia::CreateFrom1xBitmap(custom_image_bitmap);
 
   run_loop_.reset(new base::RunLoop);
   UserImageManager* user_image_manager =
       ChromeUserManager::Get()->GetUserImageManager(test_account_id1_);
-  user_image_manager->SaveUserImage(
-      user_manager::UserImage::CreateAndEncode(custom_image));
+  user_image_manager->SaveUserImage(user_manager::UserImage::CreateAndEncode(
+      custom_image, user_manager::UserImage::FORMAT_JPEG));
   run_loop_->Run();
 
   EXPECT_FALSE(user->HasDefaultImage());
   EXPECT_EQ(user_manager::User::USER_IMAGE_EXTERNAL, user->image_index());
   EXPECT_TRUE(test::AreImagesEqual(custom_image, user->GetImage()));
   ExpectUserImageInfo(test_account_id1_,
                       user_manager::User::USER_IMAGE_EXTERNAL,
                       GetUserImagePath(test_account_id1_, "jpg"));
 
   const std::unique_ptr<gfx::ImageSkia> saved_image =
@@ skipping 35 matching lines @@
                       user_manager::User::USER_IMAGE_EXTERNAL,
                       GetUserImagePath(test_account_id1_, "jpg"));
 
   const std::unique_ptr<gfx::ImageSkia> saved_image =
       test::ImageLoader(GetUserImagePath(test_account_id1_, "jpg")).Load();
   ASSERT_TRUE(saved_image);
 
   // Check image dimensions. Images can't be compared since JPEG is lossy.
   EXPECT_EQ(custom_image->width(), saved_image->width());
   EXPECT_EQ(custom_image->height(), saved_image->height());
+
+  // Replace the user image with a PNG file with transparent pixels.
+  const base::FilePath transparent_image_path =
+      test_data_dir_.Append(test::kUserAvatarImage3RelativePath);
+  const std::unique_ptr<gfx::ImageSkia> transparent_image =
+      test::ImageLoader(transparent_image_path).Load();
+  ASSERT_TRUE(transparent_image);
+  // This image should have transparent pixels (i.e. not opaque).
+  EXPECT_FALSE(SkBitmap::ComputeIsOpaque(*transparent_image->bitmap()));
+
+  run_loop_.reset(new base::RunLoop);
+  user_image_manager->SaveUserImageFromFile(transparent_image_path);
+  run_loop_->Run();
+
+  EXPECT_TRUE(test::AreImagesEqual(*transparent_image, user->GetImage()));
+  ExpectUserImageInfo(test_account_id1_,
+                      user_manager::User::USER_IMAGE_EXTERNAL,
+                      GetUserImagePath(test_account_id1_, "png"));
+
+  const std::unique_ptr<gfx::ImageSkia> new_saved_image =
+      test::ImageLoader(GetUserImagePath(test_account_id1_, "png")).Load();
+  ASSERT_TRUE(new_saved_image);
+
+  // The saved image should have transparent pixels (i.e. not opaque).
+  EXPECT_FALSE(SkBitmap::ComputeIsOpaque(*new_saved_image->bitmap()));
+
+  // The old user image file in JPEG should be deleted. Only the PNG version
+  // should stay.
+  EXPECT_FALSE(base::PathExists(GetUserImagePath(test_account_id1_, "jpg")));
+  EXPECT_TRUE(base::PathExists(GetUserImagePath(test_account_id1_, "png")));
 }
 
 IN_PROC_BROWSER_TEST_F(UserImageManagerTest,
                        PRE_SaveUserImageFromProfileImage) {
   RegisterUser(test_account_id1_.GetUserEmail());
   chromeos::StartupUtils::MarkOobeCompleted();
 }
 
 // Verifies that SaveUserImageFromProfileImage() correctly downloads, sets and
 // persists the chosen user image.
@@ skipping 375 matching lines @@
   saved_image =
       test::ImageLoader(GetUserImagePath(enterprise_account_id_, "jpg")).Load();
   ASSERT_TRUE(saved_image);
 
   // Check image dimensions. Images can't be compared since JPEG is lossy.
   EXPECT_EQ(policy_image_->width(), saved_image->width());
   EXPECT_EQ(policy_image_->height(), saved_image->height());
 }
 
 }  // namespace chromeos