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

chrome/browser/android/ntp/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_
+#ifndef CHROME_BROWSER_ANDROID_NTP_MOST_VISITED_SITES_H_
+#define CHROME_BROWSER_ANDROID_NTP_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 "chrome/browser/android/ntp/popular_sites.h"
 #include "components/history/core/browser/history_types.h"
 #include "components/history/core/browser/top_sites_observer.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 {
 class TopSites;
@@ skipping 89 matching lines @@
     Suggestion();
     ~Suggestion();
 
     Suggestion(Suggestion&&);
     Suggestion& operator=(Suggestion&&);
 
    private:
     DISALLOW_COPY_AND_ASSIGN(Suggestion);
   };
 
-  MostVisitedSites(scoped_refptr<base::SequencedWorkerPool> blocking_pool,
-                   PrefService* prefs,
+  MostVisitedSites(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);
 
   ~MostVisitedSites() override;
 
@@ skipping 126 matching lines @@
       suggestions_subscription_;
 
   ScopedObserver<history::TopSites, history::TopSitesObserver> scoped_observer_;
 
   MostVisitedSource mv_source_;
 
   std::unique_ptr<PopularSites> popular_sites_;
 
   SuggestionsVector current_suggestions_;
 
-  base::ThreadChecker thread_checker_;
-  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_
+#endif  // CHROME_BROWSER_ANDROID_NTP_MOST_VISITED_SITES_H_