Make image_decoder a Leaky LazyInstance

chrome/browser/profiles/profile_downloader.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/profiles/profile_downloader.h"
 
 #include <string>
 #include <vector>
 
 #include "base/json/json_reader.h"
@@ skipping 175 matching lines @@
   const std::string& photo_id = path_components[kPhotoIdPathComponentIndex];
   const std::string& photo_version =
       path_components[kPhotoVersionPathComponentIndex];
 
   // Check that the ID and version match the default Picasa profile photo.
   return photo_id == kPicasaPhotoId &&
          photo_version == kDefaultPicasaPhotoVersion;
 }
 
 ProfileDownloader::ProfileDownloader(ProfileDownloaderDelegate* delegate)
-    : OAuth2TokenService::Consumer("profile_downloader"),
+    : ImageDecoder::ImageRequest(

[dcheng, 2015/03/23 11:52:09]

ImageRequest should be sufficient here.

[Theresa, 2015/03/23 17:33:10]

Done.

+          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)),
+      OAuth2TokenService::Consumer("profile_downloader"),
       delegate_(delegate),
       picture_status_(PICTURE_FAILED) {
   DCHECK(delegate_);
 }
 
 void ProfileDownloader::Start() {
   StartForAccount(std::string());
 }
 
 void ProfileDownloader::StartForAccount(const std::string& account_id) {
@@ skipping 153 matching lines @@
     DVLOG(1) << "  Error: " << source->GetStatus().error();
     DVLOG(1) << "  Response code: " << source->GetResponseCode();
     DVLOG(1) << "  Url: " << source->GetURL().spec();
     delegate_->OnProfileDownloadFailure(this, network_error ?
         ProfileDownloaderDelegate::NETWORK_ERROR :
         ProfileDownloaderDelegate::SERVICE_ERROR);
     return;
   }
 
   VLOG(1) << "Decoding the image...";
-  scoped_refptr<ImageDecoder> image_decoder = new ImageDecoder(
-      this, data, ImageDecoder::DEFAULT_CODEC);
-  scoped_refptr<base::MessageLoopProxy> task_runner =
-      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI);
-  image_decoder->Start(task_runner);
+  ImageDecoder::Start(this, data, ImageDecoder::DEFAULT_CODEC, false);
 }
 
-void ProfileDownloader::OnImageDecoded(const ImageDecoder* decoder,
-                                       const SkBitmap& decoded_image) {
+void ProfileDownloader::OnImageDecoded(const SkBitmap& decoded_image) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   int image_size = delegate_->GetDesiredImageSideLength();
   profile_picture_ = skia::ImageOperations::Resize(
       decoded_image,
       skia::ImageOperations::RESIZE_BEST,
       image_size,
       image_size);
   picture_status_ = PICTURE_SUCCESS;
   delegate_->OnProfileDownloadSuccess(this);
 }
 
-void ProfileDownloader::OnDecodeImageFailed(const ImageDecoder* decoder) {
+void ProfileDownloader::OnDecodeImageFailed() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   delegate_->OnProfileDownloadFailure(
       this, ProfileDownloaderDelegate::IMAGE_DECODE_FAILED);
 }
 
 void ProfileDownloader::OnRefreshTokenAvailable(const std::string& account_id) {
   ProfileOAuth2TokenService* service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(
           delegate_->GetBrowserProfile());
   if (account_id != account_id_)
@@ skipping 19 matching lines @@
 void ProfileDownloader::OnGetTokenFailure(
     const OAuth2TokenService::Request* request,
     const GoogleServiceAuthError& error) {
   DCHECK_EQ(request, oauth2_access_token_request_.get());
   oauth2_access_token_request_.reset();
   LOG(WARNING) << "ProfileDownloader: token request using refresh token failed:"
                << error.ToString();
   delegate_->OnProfileDownloadFailure(
       this, ProfileDownloaderDelegate::TOKEN_ERROR);
 }