Make image_decoder a Leaky LazyInstance

chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc

Index: chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc
diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc b/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc
index 2ffad5ee6dd400a5d94697679a8f8b67acda8b32..847ee9b057a31804cd26f3453796bf7cbe53b561 100644
--- a/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc
+++ b/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc
@@ -105,7 +105,6 @@ SupervisedUserCreationScreen::SupervisedUserCreationScreen(
       manager_signin_in_progress_(false),
       last_page_(kNameOfIntroScreen),
       sync_service_(NULL),
-      image_decoder_(NULL),
       apply_photo_after_decoding_(false),
       selected_image_(0),
       histogram_helper_(new ErrorScreensHistogramHelper("Supervised")),
@@ -121,8 +120,6 @@ SupervisedUserCreationScreen::~SupervisedUserCreationScreen() {
     sync_service_->RemoveObserver(this);
   if (actor_)
     actor_->SetDelegate(NULL);
-  if (image_decoder_.get())
-    image_decoder_->set_delegate(NULL);
   NetworkPortalDetector::Get()->RemoveObserver(this);
 }
 
@@ -592,27 +589,21 @@ void SupervisedUserCreationScreen::OnPhotoTaken(
     const std::string& raw_data) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::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 =
       content::BrowserThread::GetMessageLoopProxyForThread(
           content::BrowserThread::UI);
-  image_decoder_->Start(task_runner);
+  ImageDecoder::GetInstance()->Start(
+      this, raw_data, ImageDecoder::DEFAULT_CODEC, task_runner, false);
 }
 
 void SupervisedUserCreationScreen::OnImageDecoded(
-    const ImageDecoder* decoder,
     const SkBitmap& decoded_image) {
-  DCHECK_EQ(image_decoder_.get(), decoder);
   user_photo_ = gfx::ImageSkia::CreateFrom1xBitmap(decoded_image);
   if (apply_photo_after_decoding_)
     ApplyPicture();
 }
 
-void SupervisedUserCreationScreen::OnDecodeImageFailed(
-    const ImageDecoder* decoder) {
+void SupervisedUserCreationScreen::OnDecodeImageFailed() {
   NOTREACHED() << "Failed to decode PNG image from WebUI";
 }