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

chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.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 "chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 280 matching lines @@
   bool waiting_for_camera_photo = false;
 
   if (StartsWithASCII(image_url, chrome::kChromeUIUserImageURL, false)) {
     // Image from file/camera uses kChromeUIUserImageURL as URL while
     // current profile image always has a full data URL.
     // This way transition from (current profile image) to
     // (profile image, current image from file) is easier.
 
     DCHECK(!previous_image_.empty());
     user_manager->SaveUserImage(user.email(),
-                                chromeos::UserImage(previous_image_));
+                                UserImage::CreateAndEncode(previous_image_));
 
     UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
                               kHistogramImageOld,
                               kHistogramImagesCount);
     VLOG(1) << "Selected old user image";
   } else if (IsDefaultImageUrl(image_url, &image_index)) {
     // One of the default user images.
     user_manager->SaveUserDefaultImageIndex(user.email(), image_index);
 
     UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
@@ skipping 38 matching lines @@
   user_manager->SaveUserImageFromFile(user_manager->GetLoggedInUser().email(),
                                       path);
   UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
                             kHistogramImageFromFile,
                             kHistogramImagesCount);
   VLOG(1) << "Selected image from file";
 }
 
 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);
   VLOG(1) << "Selected camera photo";
 }
 
 void ChangePictureOptionsHandler::CheckCameraPresence() {
   // For WebRTC, camera presence checked is done on JS side.
   if (!CommandLine::ForCurrentProcess()->
           HasSwitch(switches::kDisableHtml5Camera)) {
@@ skipping 42 matching lines @@
   OnPhotoAccepted(user_photo_);
 }
 
 void ChangePictureOptionsHandler::OnDecodeImageFailed(
     const ImageDecoder* decoder) {
   NOTREACHED() << "Failed to decode PNG image from WebUI";
 }
 
 }  // namespace options2
 }  // namespace chromeos