Make image_decoder a Leaky LazyInstance

chrome/browser/enhanced_bookmarks/android/bookmark_image_service_android.cc

 // Copyright 2014 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 "base/json/json_parser.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h"
+#include "chrome/browser/bitmap_fetcher/bitmap_batch_fetcher.h"
 #include "chrome/browser/enhanced_bookmarks/android/bookmark_image_service_android.h"
 #include "chrome/browser/enhanced_bookmarks/enhanced_bookmark_model_factory.h"
 #include "chrome/grit/browser_resources.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/enhanced_bookmarks/enhanced_bookmark_model.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 24 matching lines @@
     bool update_bookmark) {
   const BookmarkNode* bookmark =
       enhanced_bookmark_model_->bookmark_model()
           ->GetMostRecentlyAddedUserNodeForURL(page_url);
   if (!bookmark || !image_url.is_valid()) {
     ProcessNewImage(page_url, update_bookmark, gfx::Image(), image_url);
     return;
   }
 
   BitmapFetcherHandler* bitmap_fetcher_handler =
-      new BitmapFetcherHandler(this, image_url);
+      new BitmapFetcherHandler(this);
   bitmap_fetcher_handler->Start(
       browser_context_, referrer, referrer_policy,
       net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES,
-      update_bookmark, page_url);
+      update_bookmark, page_url,
+      bitmap_batch_fetcher_,
+      image_url);
 }
 
 void BookmarkImageServiceAndroid::RetrieveSalientImageFromContext(
     content::RenderFrameHost* render_frame_host,
     const GURL& page_url,
     bool update_bookmark) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   if (IsPageUrlInProgress(page_url))
     return;  // A request for this URL is already in progress.
 
@@ skipping 115 matching lines @@
   RetrieveSalientImage(page_url, GURL(image_url), referrer.url.spec(),
                        referrer_policy, update_bookmark);
 }
 
 void BookmarkImageServiceAndroid::BitmapFetcherHandler::Start(
     content::BrowserContext* browser_context,
     const std::string& referrer,
     net::URLRequest::ReferrerPolicy referrer_policy,
     int load_flags,
     bool update_bookmark,
-    const GURL& page_url) {
+    const GURL& page_url,
+    chrome::BitmapBatchFetcher& bitmap_batch_fetcher,
+    const GURL& image_url) {
+
   update_bookmark_ = update_bookmark;
   page_url_ = page_url;
 
-  bitmap_fetcher_.Start(browser_context->GetRequestContext(), referrer,
-                        referrer_policy, load_flags);
+  bitmap_batch_fetcher.Start(browser_context->GetRequestContext(), referrer,
+                        referrer_policy, load_flags,
+                        image_url,
+                        this);
 }
 
 void BookmarkImageServiceAndroid::BitmapFetcherHandler::OnFetchComplete(
     const GURL url,
     const SkBitmap* bitmap) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   gfx::Image image;
   if (bitmap) {
     gfx::ImageSkia imageSkia = gfx::ImageSkia::CreateFrom1xBitmap(*bitmap);
     imageSkia.MakeThreadSafe();
     image = gfx::Image(imageSkia);
   }
   service_->ProcessNewImage(page_url_, update_bookmark_, image, url);
 
   delete this;
 }
 
 }  // namespace enhanced_bookmarks