| 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..d59b406697ffed6a370dd8d2d370a79c90710538 100644
|
| --- a/chrome/browser/profiles/profile_downloader.cc
|
| +++ b/chrome/browser/profiles/profile_downloader.cc
|
| @@ -367,15 +367,13 @@ 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::GetInstance()->Start(this, data, ImageDecoder::DEFAULT_CODEC,
|
| + task_runner, 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(
|
| @@ -387,7 +385,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);
|
|
|