Make image_decoder a Leaky LazyInstance

chrome/browser/enhanced_bookmarks/android/bookmark_image_service_android.h

 // 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.
 
 #ifndef CHROME_BROWSER_ENHANCED_BOOKMARKS_ANDROID_BOOKMARK_IMAGE_SERVICE_ANDROID_H_
 #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;
 }
 
 namespace content {
 class BrowserContext;
 class RenderFrameHost;
 class WebContents;
 }
@@ skipping 25 matching lines @@
 
  private:
   void RetrieveSalientImageFromContextCallback(const GURL& page_url,
                                                bool update_bookmark,
                                                const base::Value* result);
 
   content::BrowserContext* browser_context_;
   // 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:
     ~BitmapFetcherHandler() override {}
 
    private:
     BookmarkImageServiceAndroid* service_;
-    chrome::BitmapFetcher bitmap_fetcher_;
     bool update_bookmark_;
     GURL page_url_;
 
     DISALLOW_COPY_AND_ASSIGN(BitmapFetcherHandler);
   };
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkImageServiceAndroid);
 };
 
 }  // namespace enhanced_bookmarks
 
 #endif  // CHROME_BROWSER_ENHANCED_BOOKMARKS_ANDROID_BOOKMARK_IMAGE_SERVICE_ANDROID_H_