Replace the usage of SkBitmap with gfx::Image in the suggestion service.

components/ntp_tiles/most_visited_sites.h

 // Copyright 2013 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 COMPONENTS_NTP_TILES_MOST_VISITED_SITES_H_
 #define COMPONENTS_NTP_TILES_MOST_VISITED_SITES_H_
 
 #include <stddef.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_observer.h"
 #include "components/history/core/browser/history_types.h"
 #include "components/history/core/browser/top_sites_observer.h"
+#include "components/image_fetcher/image_decoder.h"
 #include "components/ntp_tiles/popular_sites.h"
 #include "components/suggestions/proto/suggestions.pb.h"
 #include "components/suggestions/suggestions_service.h"
 #include "url/gurl.h"
 
 namespace gfx {
 class Image;
 }
 
 namespace history {
@@ skipping 98 matching lines @@
   };
 
   MostVisitedSites(scoped_refptr<base::SequencedWorkerPool> blocking_pool,
                    PrefService* prefs,
                    const TemplateURLService* template_url_service,
                    variations::VariationsService* variations_service,
                    net::URLRequestContextGetter* download_context,
                    const base::FilePath& popular_sites_directory,
                    scoped_refptr<history::TopSites> top_sites,
                    suggestions::SuggestionsService* suggestions,
-                   MostVisitedSitesSupervisor* supervisor);
+                   MostVisitedSitesSupervisor* supervisor,
+                   image_fetcher::ImageDecoder* image_decoder);
 
   ~MostVisitedSites() override;
 
   // Does not take ownership of |observer|, which must outlive this object and
   // must not be null.
   void SetMostVisitedURLsObserver(Observer* observer, int num_sites);
 
+  // TODO(markusheintz): Replace bitmap with gfx::Image()
   using ThumbnailCallback = base::Callback<
       void(bool /* is_local_thumbnail */, const SkBitmap* /* bitmap */)>;
-  void GetURLThumbnail(const GURL& url, const ThumbnailCallback& callback);
   void AddOrRemoveBlacklistedUrl(const GURL& url, bool add_url);
   void RecordTileTypeMetrics(const std::vector<int>& tile_types);
   void RecordOpenedMostVisitedItem(int index, int tile_type);
 
   // MostVisitedSitesSupervisor::Observer implementation.
   void OnBlockedSitesChanged() override;
 
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 
  private:
@@ skipping 46 matching lines @@
                                 SuggestionsPtrVector* dst);
 
   void SaveCurrentSuggestionsToPrefs();
 
   // Notifies the observer about the availability of suggestions.
   // Also records impressions UMA if not done already.
   void NotifyMostVisitedURLsObserver();
 
   void OnPopularSitesAvailable(bool success);
 
-  // Runs on the UI Thread.
-  void OnLocalThumbnailFetched(
-      const GURL& url,
-      const ThumbnailCallback& callback,
-      std::unique_ptr<SkBitmap> bitmap);
-
   // Callback for when the thumbnail lookup is complete.
   // Runs on the UI Thread.
   void OnObtainedThumbnail(
       bool is_local_thumbnail,
       const ThumbnailCallback& callback,
       const GURL& url,
       const gfx::Image& bitmap);
 
   // Records thumbnail-related UMA histogram metrics.
   void RecordThumbnailUMAMetrics();
 
   // Records UMA histogram metrics related to the number of impressions.
   void RecordImpressionUMAMetrics();
 
   // history::TopSitesObserver implementation.
   void TopSitesLoaded(history::TopSites* top_sites) override;
   void TopSitesChanged(history::TopSites* top_sites,
                        ChangeReason change_reason) override;
 
   PrefService* prefs_;
   const TemplateURLService* template_url_service_;
   variations::VariationsService* variations_service_;
   net::URLRequestContextGetter* download_context_;
   base::FilePath popular_sites_directory_;
   scoped_refptr<history::TopSites> top_sites_;
   suggestions::SuggestionsService* suggestions_service_;
   MostVisitedSitesSupervisor* supervisor_;
+  std::unique_ptr<image_fetcher::ImageDecoder> image_decoder_;
 
   Observer* observer_;
 
   // The maximum number of most visited sites to return.
   int num_sites_;
 
   // Whether we have received an initial set of most visited sites (from either
   // TopSites or the SuggestionsService).
   bool received_most_visited_sites_;
 
@@ skipping 21 matching lines @@
   scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
   scoped_refptr<base::TaskRunner> blocking_runner_;
 
   // For callbacks may be run after destruction.
   base::WeakPtrFactory<MostVisitedSites> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MostVisitedSites);
 };
 
 #endif  // COMPONENTS_NTP_TILES_MOST_VISITED_SITES_H_