Pass the ImageDecoder to the ImageFetcher at creation time.

components/image_fetcher/image_fetcher_impl.h

Index: components/image_fetcher/image_fetcher_impl.h
diff --git a/chrome/browser/search/suggestions/image_fetcher_impl.h b/components/image_fetcher/image_fetcher_impl.h
similarity index 83%
rename from chrome/browser/search/suggestions/image_fetcher_impl.h
rename to components/image_fetcher/image_fetcher_impl.h
index 61aaf042fab052867717eab1ad0162ccd5173d6a..9fccf628b1c1bf8a1280ea859c9cd1c69ac083fb 100644
--- a/chrome/browser/search/suggestions/image_fetcher_impl.h
+++ b/components/image_fetcher/image_fetcher_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SEARCH_SUGGESTIONS_IMAGE_FETCHER_IMPL_H_
-#define CHROME_BROWSER_SEARCH_SUGGESTIONS_IMAGE_FETCHER_IMPL_H_
+#ifndef COMPONENTS_IMAGE_FETCHER_IMAGE_FETCHER_IMPL_H_
+#define COMPONENTS_IMAGE_FETCHER_IMAGE_FETCHER_IMPL_H_
 
 #include <map>
 #include <string>
@@ -25,13 +25,17 @@ namespace net {
 class URLRequestContextGetter;
 }
 
-// TODO(markusheintz): Move the ImageFetcherImpl to components/image_fetcher
-namespace suggestions {
+namespace image_fetcher {
+
+// TODO(markusheintz): Once the iOS implementation of the ImageFetcher is
+// removed merge the two classes ImageFetcher and ImageFetcherImpl.
 
 // image_fetcher::ImageFetcher implementation.

[Marc Treib, 2016/06/29 13:57:33]

nit: This comment is a bit redundant now :)

[markusheintz_, 2016/06/29 14:36:45]

Comment removed

 class ImageFetcherImpl : public image_fetcher::ImageFetcher {
  public:
-  explicit ImageFetcherImpl(net::URLRequestContextGetter* url_request_context);
+  ImageFetcherImpl(
+      image_fetcher::ImageDecoder* image_decoder,

[Bernhard Bauer, 2016/06/29 13:55:58]

Pass |image_decoder| as a unique_ptr? For ease of construction you can use
base::MakeUnique<ImageDecoderImpl>() at call sites.

[Marc Treib, 2016/06/29 13:57:33]

This should be a unique_ptr, since the ImageFetcherImpl takes ownership

[markusheintz_, 2016/06/29 14:36:45]

Done.

[markusheintz_, 2016/06/29 14:36:45]

Done.

+      net::URLRequestContextGetter* url_request_context);
   ~ImageFetcherImpl() override;
 
   void SetImageFetcherDelegate(
@@ -90,6 +94,6 @@ class ImageFetcherImpl : public image_fetcher::ImageFetcher {
   DISALLOW_COPY_AND_ASSIGN(ImageFetcherImpl);
 };
 
-}  // namespace suggestions
+}  // namespace image_fetcher
 
-#endif  // CHROME_BROWSER_SEARCH_SUGGESTIONS_IMAGE_FETCHER_IMPL_H_
+#endif  // COMPONENTS_IMAGE_FETCHER_IMAGE_FETCHER_IMPL_H_