Make image_decoder a Leaky LazyInstance

chrome/browser/chromeos/login/screens/user_image_screen.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/screens/user_image_screen.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 48 matching lines @@
 
 // static
 UserImageScreen* UserImageScreen::Get(ScreenManager* manager) {
   return static_cast<UserImageScreen*>(
       manager->GetScreen(WizardController::kUserImageScreenName));
 }
 
 UserImageScreen::UserImageScreen(BaseScreenDelegate* base_screen_delegate,
                                  UserImageView* view)
     : UserImageModel(base_screen_delegate),
+      ImageRequest(
+          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)),
       view_(view),
       accept_photo_after_decoding_(false),
       selected_image_(user_manager::User::USER_IMAGE_INVALID),
       is_screen_ready_(false),
       user_has_selected_image_(false) {
   if (view_)
     view_->Bind(*this);
   notification_registrar_.Add(this,
                               chrome::NOTIFICATION_PROFILE_IMAGE_UPDATED,
                               content::NotificationService::AllSources());
   notification_registrar_.Add(this,
                               chrome::NOTIFICATION_PROFILE_IMAGE_UPDATE_FAILED,
                               content::NotificationService::AllSources());
   notification_registrar_.Add(this,
                               chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED,
                               content::NotificationService::AllSources());
   GetContextEditor().SetString(kContextKeyProfilePictureDataURL, std::string());
 }
 
 UserImageScreen::~UserImageScreen() {
   CameraPresenceNotifier::GetInstance()->RemoveObserver(this);
   if (view_)
     view_->Unbind();
-  if (image_decoder_.get())
-    image_decoder_->set_delegate(NULL);
 }
 
 void UserImageScreen::OnScreenReady() {
   is_screen_ready_ = true;
   if (!IsWaitingForSync())
     HideCurtain();
 }
 
 void UserImageScreen::OnPhotoTaken(const std::string& raw_data) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   user_photo_ = gfx::ImageSkia();
-  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::Cancel(this);
+  ImageDecoder::Start(this, raw_data);
 }
 
 void UserImageScreen::OnCameraPresenceCheckDone(bool is_camera_present) {
   GetContextEditor().SetBoolean(kContextKeyIsCameraPresent, is_camera_present);
 }
 
 void UserImageScreen::HideCurtain() {
   if (view_)
     view_->HideCurtain();
 }
 
-void UserImageScreen::OnImageDecoded(const ImageDecoder* decoder,
-                                     const SkBitmap& decoded_image) {
-  DCHECK_EQ(image_decoder_.get(), decoder);
+void UserImageScreen::OnImageDecoded(const SkBitmap& decoded_image) {
   user_photo_ = gfx::ImageSkia::CreateFrom1xBitmap(decoded_image);
   if (accept_photo_after_decoding_)
     OnImageAccepted();
 }
 
-void UserImageScreen::OnDecodeImageFailed(const ImageDecoder* decoder) {
+void UserImageScreen::OnDecodeImageFailed() {
   NOTREACHED() << "Failed to decode PNG image from WebUI";
 }
 
 void UserImageScreen::OnInitialSync(bool local_image_updated) {
   DCHECK(sync_timer_);
   if (!local_image_updated) {
     sync_timer_.reset();
     GetSyncObserver()->RemoveObserver(this);
     if (is_screen_ready_)
       HideCurtain();
@@ skipping 203 matching lines @@
 
 void UserImageScreen::ExitScreen() {
   policy_registrar_.reset();
   sync_timer_.reset();
   if (UserImageSyncObserver* sync_observer = GetSyncObserver())
     sync_observer->RemoveObserver(this);
   Finish(BaseScreenDelegate::USER_IMAGE_SELECTED);
 }
 
 }  // namespace chromeos