Index: chrome/browser/profiles/profile_downloader.cc |
diff --git a/chrome/browser/profiles/profile_downloader.cc b/chrome/browser/profiles/profile_downloader.cc |
index 5fbb738cddbbd2f0ba70424e7b76f62b09cf605d..2377772ebde2ee9a379e2153f591755b8e6a4d2e 100644 |
--- a/chrome/browser/profiles/profile_downloader.cc |
+++ b/chrome/browser/profiles/profile_downloader.cc |
@@ -193,7 +193,9 @@ bool ProfileDownloader::IsDefaultProfileImageURL(const std::string& url) { |
} |
ProfileDownloader::ProfileDownloader(ProfileDownloaderDelegate* delegate) |
- : OAuth2TokenService::Consumer("profile_downloader"), |
+ : ImageRequest( |
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)), |
+ OAuth2TokenService::Consumer("profile_downloader"), |
delegate_(delegate), |
picture_status_(PICTURE_FAILED) { |
DCHECK(delegate_); |
@@ -367,15 +369,10 @@ void ProfileDownloader::OnURLFetchComplete(const net::URLFetcher* source) { |
} |
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); |
} |
-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( |
@@ -387,7 +384,7 @@ void ProfileDownloader::OnImageDecoded(const ImageDecoder* decoder, |
delegate_->OnProfileDownloadSuccess(this); |
} |
-void ProfileDownloader::OnDecodeImageFailed(const ImageDecoder* decoder) { |
+void ProfileDownloader::OnDecodeImageFailed() { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
delegate_->OnProfileDownloadFailure( |
this, ProfileDownloaderDelegate::IMAGE_DECODE_FAILED); |