Make image_decoder a Leaky LazyInstance

chrome/browser/enhanced_bookmarks/android/bookmark_image_service_android.h

Index: chrome/browser/enhanced_bookmarks/android/bookmark_image_service_android.h
diff --git a/chrome/browser/enhanced_bookmarks/android/bookmark_image_service_android.h b/chrome/browser/enhanced_bookmarks/android/bookmark_image_service_android.h
index 680e8dc36cdfea838362ab0b04744f5e7a1b45c1..d7fac6204e7287fe15d491d98511e5eba81c5b72 100644
--- a/chrome/browser/enhanced_bookmarks/android/bookmark_image_service_android.h
+++ b/chrome/browser/enhanced_bookmarks/android/bookmark_image_service_android.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_ENHANCED_BOOKMARKS_ANDROID_BOOKMARK_IMAGE_SERVICE_ANDROID_H_
 
 #include "components/enhanced_bookmarks/bookmark_image_service.h"
-#include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h"
+#include "chrome/browser/bitmap_fetcher/bitmap_batch_fetcher.h"
 
 namespace chrome {
 class BitmapFetcher;
@@ -52,17 +52,20 @@ class BookmarkImageServiceAndroid : public BookmarkImageService {
   // The script injected in a page to extract image urls.
   base::string16 script_;
 
+  chrome::BitmapBatchFetcher bitmap_batch_fetcher_;
+
   class BitmapFetcherHandler : private chrome::BitmapFetcherDelegate {
    public:
-    explicit BitmapFetcherHandler(BookmarkImageServiceAndroid* service,
-                                  const GURL& image_url)
-        : service_(service), bitmap_fetcher_(image_url, this) {}
+    explicit BitmapFetcherHandler(BookmarkImageServiceAndroid* service)
+        : service_(service) {}
     void 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);
     void OnFetchComplete(const GURL url, const SkBitmap* bitmap) override;
 
    protected:
@@ -70,7 +73,6 @@ class BookmarkImageServiceAndroid : public BookmarkImageService {
 
    private:
     BookmarkImageServiceAndroid* service_;
-    chrome::BitmapFetcher bitmap_fetcher_;
     bool update_bookmark_;
     GURL page_url_;