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

chrome/browser/chromeos/login/user_image_loader.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/chromeos/login/user_image_loader.h"
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/user_image.h"
 #include "content/public/browser/browser_thread.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/skbitmap_operations.h"
 
 using content::BrowserThread;
 
 namespace chromeos {
 
 UserImageLoader::ImageInfo::ImageInfo(int size,
-                                      bool load_raw_image,
                                       const LoadedCallback& loaded_cb)
     : size(size),
-      load_raw_image(load_raw_image),
       loaded_cb(loaded_cb) {
 }
 
 UserImageLoader::ImageInfo::~ImageInfo() {
 }
 
 UserImageLoader::UserImageLoader()
     : target_message_loop_(NULL) {
 }
 
 UserImageLoader::~UserImageLoader() {
 }
 
 void UserImageLoader::Start(const std::string& filepath,
                             int size,
-                            bool load_raw_image,
                             const LoadedCallback& loaded_cb) {
   target_message_loop_ = MessageLoop::current();
 
-  ImageInfo image_info(size, load_raw_image, loaded_cb);
+  ImageInfo image_info(size, loaded_cb);
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&UserImageLoader::LoadImage, this, filepath, image_info));
 }
 
 void UserImageLoader::LoadImage(const std::string& filepath,
                                 const ImageInfo& image_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   std::string image_data;
@@ skipping 30 matching lines @@
       final_image =
           skia::ImageOperations::Resize(cropped_image,
                                         skia::ImageOperations::RESIZE_LANCZOS3,
                                         image_info.size,
                                         image_info.size);
     } else {
       final_image = cropped_image;
     }
   }
 
-  scoped_ptr<UserImage> user_image;
-  if (image_info.load_raw_image)
-    user_image.reset(new UserImage(final_image, decoder->get_image_data()));
-  else
-    user_image.reset(new UserImage(final_image));
-
   target_message_loop_->PostTask(
       FROM_HERE,
-      base::Bind(image_info.loaded_cb, *user_image));
+      base::Bind(image_info.loaded_cb,
+                 UserImage(final_image, decoder->get_image_data())));
 
   image_info_map_.erase(info_it);
 }
 
 void UserImageLoader::OnDecodeImageFailed(const ImageDecoder* decoder) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   image_info_map_.erase(decoder);
 }
 
 }  // namespace chromeos