Make image_decoder a Leaky LazyInstance

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

 // Copyright (c) 2013 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/options/chromeos/change_picture_options_handler.h"
 
 #include "ash/audio/sounds.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 80 matching lines @@
   manager->Initialize(SOUND_OBJECT_DELETE,
                       bundle.GetRawDataResource(IDR_SOUND_OBJECT_DELETE_WAV));
   manager->Initialize(SOUND_CAMERA_SNAP,
                       bundle.GetRawDataResource(IDR_SOUND_CAMERA_SNAP_WAV));
 }
 
 ChangePictureOptionsHandler::~ChangePictureOptionsHandler() {
   CameraPresenceNotifier::GetInstance()->RemoveObserver(this);
   if (select_file_dialog_.get())
     select_file_dialog_->ListenerDestroyed();
-  if (image_decoder_.get())
-    image_decoder_->set_delegate(NULL);
 }
 
 void ChangePictureOptionsHandler::GetLocalizedValues(
     base::DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
   localized_strings->SetString("changePicturePage",
       l10n_util::GetStringUTF16(IDS_OPTIONS_CHANGE_PICTURE_DIALOG_TITLE));
   localized_strings->SetString("changePicturePageDescription",
       l10n_util::GetStringUTF16(IDS_OPTIONS_CHANGE_PICTURE_DIALOG_TEXT));
   localized_strings->SetString("takePhoto",
@@ skipping 120 matching lines @@
   DCHECK(!image_url.empty());
 
   std::string mime_type, charset, raw_data;
   if (!net::DataURL::Parse(GURL(image_url), &mime_type, &charset, &raw_data))
     NOTREACHED();
   DCHECK_EQ("image/png", mime_type);
 
   user_photo_ = gfx::ImageSkia();
   user_photo_data_url_ = image_url;
 
-  if (image_decoder_.get())
-    image_decoder_->set_delegate(NULL);
-  image_decoder_ = new ImageDecoder(this, raw_data,
-                                    ImageDecoder::DEFAULT_CODEC);
   scoped_refptr<base::MessageLoopProxy> task_runner =
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI);
-  image_decoder_->Start(task_runner);
+  ImageDecoder::GetInstance()->Start(this, raw_data,
+                                     ImageDecoder::DEFAULT_CODEC,
+                                     task_runner);
 }
 
 void ChangePictureOptionsHandler::HandlePageInitialized(
     const base::ListValue* args) {
   DCHECK(args && args->empty());
   SendDefaultImages();
 }
 
 void ChangePictureOptionsHandler::HandlePageShown(const base::ListValue* args) {
   DCHECK(args && args->empty());
@@ skipping 103 matching lines @@
     user_image_manager->SaveUserDefaultImageIndex(image_index);
 
     UMA_HISTOGRAM_ENUMERATION(
         "UserImage.ChangeChoice",
         user_manager::GetDefaultImageHistogramValue(image_index),
         user_manager::kHistogramImagesCount);
     VLOG(1) << "Selected default user image: " << image_index;
   } else if (image_type == "camera") {
     // Camera image is selected.
     if (user_photo_.isNull()) {
-      DCHECK(image_decoder_.get());
       waiting_for_camera_photo = true;
       VLOG(1) << "Still waiting for camera image to decode";
     } else {
       SetImageFromCamera(user_photo_);
     }
   } else if (image_type == "profile") {
     // Profile image selected. Could be previous (old) user image.
     user_image_manager->SaveUserImageFromProfileImage();
 
     if (previous_image_index_ == user_manager::User::USER_IMAGE_PROFILE) {
       UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
                                 user_manager::kHistogramImageOld,
                                 user_manager::kHistogramImagesCount);
       VLOG(1) << "Selected old (profile) user image";
     } else {
       UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
                                 user_manager::kHistogramImageFromProfile,
                                 user_manager::kHistogramImagesCount);
       VLOG(1) << "Selected profile image";
     }
   } else {
     NOTREACHED() << "Unexpected image type: " << image_type;
   }
-
-  // Ignore the result of the previous decoding if it's no longer needed.
-  if (!waiting_for_camera_photo && image_decoder_.get())
-    image_decoder_->set_delegate(NULL);
 }
 
 void ChangePictureOptionsHandler::FileSelected(const base::FilePath& path,
                                                int index,
                                                void* params) {
   ChromeUserManager::Get()
       ->GetUserImageManager(GetUser()->email())
       ->SaveUserImageFromFile(path);
   UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
                             user_manager::kHistogramImageFromFile,
@@ skipping 40 matching lines @@
   }
 }
 
 gfx::NativeWindow ChangePictureOptionsHandler::GetBrowserWindow() const {
   Browser* browser =
       chrome::FindBrowserWithWebContents(web_ui()->GetWebContents());
   return browser->window()->GetNativeWindow();
 }
 
 void ChangePictureOptionsHandler::OnImageDecoded(
-    const ImageDecoder* decoder,
     const SkBitmap& decoded_image) {
-  DCHECK_EQ(image_decoder_.get(), decoder);
-  image_decoder_ = NULL;
   user_photo_ = gfx::ImageSkia::CreateFrom1xBitmap(decoded_image);
   SetImageFromCamera(user_photo_);
 }
 
-void ChangePictureOptionsHandler::OnDecodeImageFailed(
-    const ImageDecoder* decoder) {
+void ChangePictureOptionsHandler::OnDecodeImageFailed() {
   NOTREACHED() << "Failed to decode PNG image from WebUI";
 }
 
 const user_manager::User* ChangePictureOptionsHandler::GetUser() const {
   Profile* profile = Profile::FromWebUI(web_ui());
   const user_manager::User* user =
       ProfileHelper::Get()->GetUserByProfile(profile);
   if (!user)
     return user_manager::UserManager::Get()->GetActiveUser();
   return user;
 }
 
 }  // namespace options
 }  // namespace chromeos