Use only IJG decoding path to decode profile pictures on login screen

chrome/browser/chromeos/login/user_image_manager_browsertest.cc

 // Copyright (c) 2012 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 <string>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/path_service.h"
@@ skipping 214 matching lines @@
   ScopedMockUserManagerEnabler mock_user_manager;
   SaveUserImagePNG(
       kTestUser1, kDefaultImageResourceIDs[kFirstDefaultImageIndex]);
 }
 
 IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_NonJPEGImageFromFile) {
   UserManager::Get()->GetUsers();  // Load users.
   // Old info preserved.
   ExpectOldUserImageInfo(kTestUser1, User::kExternalImageIndex,
                          GetUserImagePath(kTestUser1, "png"));
+  const User* user = UserManager::Get()->FindUser(kTestUser1);
+  EXPECT_TRUE(user->image_is_stub());
   LogIn(kTestUser1);
   // Wait for migration.
   content::RunMessageLoop();
   // Image info is migrated and the image is converted to JPG.
   ExpectNewUserImageInfo(kTestUser1, User::kExternalImageIndex,
                          GetUserImagePath(kTestUser1, "jpg"));
-  const User* user = UserManager::Get()->GetLoggedInUser();
+  user = UserManager::Get()->GetLoggedInUser();
   ASSERT_TRUE(user);
   EXPECT_FALSE(user->image_is_safe_format());
   // Check image dimensions.
   const gfx::ImageSkia& saved_image = GetDefaultImage(kFirstDefaultImageIndex);
   EXPECT_EQ(saved_image.width(), user->image().width());
   EXPECT_EQ(saved_image.height(), user->image().height());
 }
 
 IN_PROC_BROWSER_TEST_F(UserImageManagerTest, NonJPEGImageFromFile) {
   ExpectImageChange();
   UserManager::Get()->GetUsers();  // Load users.
   // Wait for image load.
   content::RunMessageLoop();
   // Now the migrated image is used.
   const User* user = UserManager::Get()->FindUser(kTestUser1);
   ASSERT_TRUE(user);
   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);
   EXPECT_EQ(saved_image.width(), user->image().width());
   EXPECT_EQ(saved_image.height(), user->image().height());
 }
 
 }  // namespace chromeos