Make image_decoder a Leaky LazyInstance

chrome/browser/ui/app_list/search/common/url_icon_source.cc

 // Copyright 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/ui/app_list/search/common/url_icon_source.h"
 
 #include <string>
 
 #include "content/public/browser/browser_thread.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_status.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia_operations.h"
 
 using content::BrowserThread;
 
 namespace app_list {
 
-UrlIconSource::UrlIconSource(
-    const IconLoadedCallback& icon_loaded_callback,
-    net::URLRequestContextGetter* context_getter,
-    const GURL& icon_url,
-    int icon_size,
-    int default_icon_resource_id)
-    : icon_loaded_callback_(icon_loaded_callback),
+UrlIconSource::UrlIconSource(const IconLoadedCallback& icon_loaded_callback,
+                             net::URLRequestContextGetter* context_getter,
+                             const GURL& icon_url,
+                             int icon_size,
+                             int default_icon_resource_id)
+    : ImageRequest(
+          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)),
+      icon_loaded_callback_(icon_loaded_callback),
       context_getter_(context_getter),
       icon_url_(icon_url),
       icon_size_(icon_size),
       default_icon_resource_id_(default_icon_resource_id),
       icon_fetch_attempted_(false) {
   DCHECK(!icon_loaded_callback_.is_null());
 }
 
 UrlIconSource::~UrlIconSource() {
-  if (image_decoder_.get())
-    image_decoder_->set_delegate(NULL);
 }
 
 void UrlIconSource::StartIconFetch() {
   icon_fetch_attempted_ = true;
 
   icon_fetcher_.reset(
       net::URLFetcher::Create(icon_url_, net::URLFetcher::GET, this));
   icon_fetcher_->SetRequestContext(context_getter_);
   icon_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES);
   icon_fetcher_->Start();
@@ skipping 17 matching lines @@
   scoped_ptr<net::URLFetcher> fetcher(icon_fetcher_.Pass());
 
   if (!fetcher->GetStatus().is_success() ||
       fetcher->GetResponseCode() != 200) {
     return;
   }
 
   std::string unsafe_icon_data;
   fetcher->GetResponseAsString(&unsafe_icon_data);
 
-  image_decoder_ =
-      new ImageDecoder(this, unsafe_icon_data, ImageDecoder::DEFAULT_CODEC);
-  image_decoder_->Start(
-      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI));
+  ImageDecoder::Start(this, unsafe_icon_data);
 }
 
-void UrlIconSource::OnImageDecoded(const ImageDecoder* decoder,
-                                   const SkBitmap& decoded_image) {
+void UrlIconSource::OnImageDecoded(const SkBitmap& decoded_image) {
   icon_ = gfx::ImageSkiaOperations::CreateResizedImage(
       gfx::ImageSkia::CreateFrom1xBitmap(decoded_image),
       skia::ImageOperations::RESIZE_BEST,
       gfx::Size(icon_size_, icon_size_));
 
   icon_loaded_callback_.Run();
 }
 
-void UrlIconSource::OnDecodeImageFailed(
-    const ImageDecoder* decoder) {
+void UrlIconSource::OnDecodeImageFailed() {
   // Failed to decode image. Do nothing and just use the default icon.
 }
 
 }  // namespace app_list