Make image_decoder a Leaky LazyInstance

chrome/browser/enhanced_bookmarks/android/bookmark_image_service_android.cc

Index: chrome/browser/enhanced_bookmarks/android/bookmark_image_service_android.cc
diff --git a/chrome/browser/enhanced_bookmarks/android/bookmark_image_service_android.cc b/chrome/browser/enhanced_bookmarks/android/bookmark_image_service_android.cc
index 5671c783b2578bf443d94d567e3a09454003bfe0..7af85cba013ea0ff9da01df94d374dd215f63092 100644
--- a/chrome/browser/enhanced_bookmarks/android/bookmark_image_service_android.cc
+++ b/chrome/browser/enhanced_bookmarks/android/bookmark_image_service_android.cc
@@ -5,7 +5,7 @@
 #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"
@@ -50,11 +50,13 @@ void BookmarkImageServiceAndroid::RetrieveSalientImage(
   }
 
   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(
@@ -190,12 +192,17 @@ void BookmarkImageServiceAndroid::BitmapFetcherHandler::Start(
     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(