[cros] Encode user images when set from WebUI (regression fix).

chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.cc

Index: chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.cc
diff --git a/chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.cc b/chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.cc
index 60c3d9f398a398ef65ebca91685fc9576972dd58..15f4c975b84eaf944e4041902025110f1df4528f 100644
--- a/chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.cc
@@ -298,7 +298,7 @@ void ChangePictureOptionsHandler::HandleSelectImage(const ListValue* args) {
 
     DCHECK(!previous_image_.empty());
     user_manager->SaveUserImage(user.email(),
-                                chromeos::UserImage(previous_image_));
+                                UserImage::CreateAndEncode(previous_image_));
 
     UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
                               kHistogramImageOld,
@@ -357,8 +357,10 @@ void ChangePictureOptionsHandler::FileSelected(const FilePath& path,
 
 void ChangePictureOptionsHandler::OnPhotoAccepted(const gfx::ImageSkia& photo) {
   UserManager* user_manager = UserManager::Get();
+  // TODO(ivankr): once old camera UI is gone, there's always raw data in
+  // |image_decoder_|, pass UserImage and user it instead.
   user_manager->SaveUserImage(user_manager->GetLoggedInUser().email(),
-                              chromeos::UserImage(photo));
+                              UserImage::CreateAndEncode(photo));
   UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
                             kHistogramImageFromCamera,
                             kHistogramImagesCount);