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

chrome/browser/android/ntp/most_visited_sites.cc

 // 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.
 
-#include "components/ntp_tiles/most_visited_sites.h"
+#include "chrome/browser/android/ntp/most_visited_sites.h"
 
-#include <algorithm>
-#include <set>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "components/history/core/browser/top_sites.h"
 #include "components/ntp_tiles/pref_names.h"
 #include "components/ntp_tiles/switches.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
 #include "components/variations/variations_associated_data.h"
+#include "content/public/browser/browser_thread.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "url/gurl.h"
 
+using content::BrowserThread;
 using history::TopSites;
 using suggestions::ChromeSuggestion;
 using suggestions::SuggestionsProfile;
 using suggestions::SuggestionsService;
 
 namespace {
 
 // Identifiers for the various tile sources.
 const char kHistogramClientName[] = "client";
 const char kHistogramServerName[] = "server";
@@ skipping 15 matching lines @@
     NONE,
     // The item displays a site's actual favicon or touch icon.
     ICON_REAL,
     // The item displays a color derived from the site's favicon or touch icon.
     ICON_COLOR,
     // The item displays a default gray box in place of an icon.
     ICON_DEFAULT,
     NUM_TILE_TYPES,
 };
 
-// May only be called from blocking thread pool.
-std::unique_ptr<SkBitmap> TryFetchLocalThumbnail(
+std::unique_ptr<SkBitmap> MaybeFetchLocalThumbnail(
     const GURL& url,
     const scoped_refptr<TopSites>& top_sites) {
+  DCHECK_CURRENTLY_ON(BrowserThread::DB);
   scoped_refptr<base::RefCountedMemory> image;
   std::unique_ptr<SkBitmap> bitmap;
-  if (top_sites->GetPageThumbnail(url, false, &image))
+  if (top_sites && top_sites->GetPageThumbnail(url, false, &image))
     bitmap = gfx::JPEGCodec::Decode(image->front(), image->size());
   return bitmap;
 }
 
 // Log an event for a given |histogram| at a given element |position|. This
 // routine exists because regular histogram macros are cached thus can't be used
 // if the name of the histogram will change at a given call site.
 void LogHistogramEvent(const std::string& histogram,
                        int position,
                        int num_sites) {
@@ skipping 79 matching lines @@
 
 MostVisitedSites::Suggestion::Suggestion() : provider_index(-1) {}
 
 MostVisitedSites::Suggestion::~Suggestion() {}
 
 MostVisitedSites::Suggestion::Suggestion(Suggestion&&) = default;
 MostVisitedSites::Suggestion&
 MostVisitedSites::Suggestion::operator=(Suggestion&&) = default;
 
 MostVisitedSites::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,
     SuggestionsService* suggestions,
     MostVisitedSitesSupervisor* supervisor)
     : prefs_(prefs),
       template_url_service_(template_url_service),
       variations_service_(variations_service),
       download_context_(download_context),
       popular_sites_directory_(popular_sites_directory),
       top_sites_(top_sites),
       suggestions_service_(suggestions),
       supervisor_(supervisor),
       observer_(nullptr),
       num_sites_(0),
       received_most_visited_sites_(false),
       received_popular_sites_(false),
       recorded_uma_(false),
       scoped_observer_(this),
       mv_source_(SUGGESTIONS_SERVICE),
-      blocking_pool_(std::move(blocking_pool)),
-      blocking_runner_(blocking_pool_->GetTaskRunnerWithShutdownBehavior(
-          base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN)),
       weak_ptr_factory_(this) {
-  DCHECK(top_sites_);
-  DCHECK(suggestions_service_);
   supervisor_->SetObserver(this);
 }
 
 MostVisitedSites::~MostVisitedSites() {
   supervisor_->SetObserver(nullptr);
 }
 
 void MostVisitedSites::SetMostVisitedURLsObserver(Observer* observer,
                                                   int num_sites) {
   DCHECK(observer);
   observer_ = observer;
   num_sites_ = num_sites;
 
   if (ShouldShowPopularSites() &&
       NeedPopularSites(prefs_, num_sites_)) {
     popular_sites_.reset(new PopularSites(
-        blocking_pool_, prefs_, template_url_service_, variations_service_,
-        download_context_, popular_sites_directory_, GetPopularSitesCountry(),
+        prefs_, template_url_service_, variations_service_, download_context_,
+        popular_sites_directory_, GetPopularSitesCountry(),
         GetPopularSitesVersion(), false,
         base::Bind(&MostVisitedSites::OnPopularSitesAvailable,
                    base::Unretained(this))));
   } else {
     received_popular_sites_ = true;
   }
 
-  // TopSites updates itself after a delay. To ensure up-to-date results,
-  // force an update now.
-  top_sites_->SyncWithHistory();
+  // TODO(treib): Can |top_sites_| ever be null? If not, remove these checks.
+  if (top_sites_) {
+    // TopSites updates itself after a delay. To ensure up-to-date results,
+    // force an update now.
+    top_sites_->SyncWithHistory();
 
-  // Register as TopSitesObserver so that we can update ourselves when the
-  // TopSites changes.
-  scoped_observer_.Add(top_sites_.get());
+    // Register as TopSitesObserver so that we can update ourselves when the
+    // TopSites changes.
+    scoped_observer_.Add(top_sites_.get());
+  }
 
   suggestions_subscription_ = suggestions_service_->AddCallback(
       base::Bind(&MostVisitedSites::OnSuggestionsProfileAvailable,
                  base::Unretained(this)));
 
   // Immediately build the current suggestions, getting personal suggestions
   // from the SuggestionsService's cache or, if that is empty, from TopSites.
   BuildCurrentSuggestions();
   // Also start a request for fresh suggestions.
   suggestions_service_->FetchSuggestionsData();
 }
 
 void MostVisitedSites::GetURLThumbnail(const GURL& url,
                                        const ThumbnailCallback& callback) {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  base::PostTaskAndReplyWithResult(
-      blocking_runner_.get(), FROM_HERE,
-      base::Bind(&TryFetchLocalThumbnail, url, top_sites_),
+  // TODO(treib): Move this to the blocking pool? Doesn't seem related to DB.
+  BrowserThread::PostTaskAndReplyWithResult(
+      BrowserThread::DB, FROM_HERE,
+      base::Bind(&MaybeFetchLocalThumbnail, url, top_sites_),
       base::Bind(&MostVisitedSites::OnLocalThumbnailFetched,
                  weak_ptr_factory_.GetWeakPtr(), url, callback));
 }
 
 void MostVisitedSites::OnLocalThumbnailFetched(
     const GURL& url,
     const ThumbnailCallback& callback,
     std::unique_ptr<SkBitmap> bitmap) {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (bitmap.get()) {
     callback.Run(true /* is_local_thumbnail */, bitmap.get());
     return;
   }
 
   // A thumbnail is not locally available for |url|. Make sure it is put in
   // the list to be fetched at the next visit to this site.
-  top_sites_->AddForcedURL(url, base::Time::Now());
+  if (top_sites_)
+    top_sites_->AddForcedURL(url, base::Time::Now());
   // Also fetch a remote thumbnail if possible. PopularSites or the
   // SuggestionsService can supply a thumbnail download URL.
   if (popular_sites_) {
     const std::vector<PopularSites::Site>& sites = popular_sites_->sites();
     auto it = std::find_if(
         sites.begin(), sites.end(),
         [&url](const PopularSites::Site& site) { return site.url == url; });
     if (it != sites.end() && it->thumbnail_url.is_valid()) {
       return suggestions_service_->GetPageThumbnailWithURL(
           url, it->thumbnail_url,
           base::Bind(&MostVisitedSites::OnObtainedThumbnail,
                      weak_ptr_factory_.GetWeakPtr(), false, callback));
     }
   }
   if (mv_source_ == SUGGESTIONS_SERVICE) {
     return suggestions_service_->GetPageThumbnail(
         url, base::Bind(&MostVisitedSites::OnObtainedThumbnail,
                         weak_ptr_factory_.GetWeakPtr(), false, callback));
   }
   // If no bitmap could be fetched and neither PopularSites nor the
   // SuggestionsService is available then a nullptr is passed to the callback.
   callback.Run(true /* is_local_thumbnail */, nullptr);
 }
 
 void MostVisitedSites::OnObtainedThumbnail(bool is_local_thumbnail,
                                            const ThumbnailCallback& callback,
                                            const GURL& url,
                                            const gfx::Image& image) {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   const SkBitmap* bitmap = nullptr;
   if (!image.IsEmpty())
     bitmap = image.ToSkBitmap();
   callback.Run(is_local_thumbnail, bitmap);
 }
 
 void MostVisitedSites::AddOrRemoveBlacklistedUrl(const GURL& url,
                                                  bool add_url) {
   // Always blacklist in the local TopSites.
-  if (add_url)
-    top_sites_->AddBlacklistedURL(url);
-  else
-    top_sites_->RemoveBlacklistedURL(url);
+  if (top_sites_) {
+    if (add_url)
+      top_sites_->AddBlacklistedURL(url);
+    else
+      top_sites_->RemoveBlacklistedURL(url);
+  }
 
   // Only blacklist in the server-side suggestions service if it's active.
   if (mv_source_ == SUGGESTIONS_SERVICE) {
     if (add_url)
       suggestions_service_->BlacklistURL(url);
     else
       suggestions_service_->UndoBlacklistURL(url);
   }
 }
 
@@ skipping 49 matching lines @@
 }
 
 void MostVisitedSites::BuildCurrentSuggestions() {
   // Get the current suggestions from cache. If the cache is empty, this will
   // fall back to TopSites.
   OnSuggestionsProfileAvailable(
       suggestions_service_->GetSuggestionsDataFromCache());
 }
 
 void MostVisitedSites::InitiateTopSitesQuery() {
+  if (!top_sites_)
+    return;
+
   top_sites_->GetMostVisitedURLs(
       base::Bind(&MostVisitedSites::OnMostVisitedURLsAvailable,
                  weak_ptr_factory_.GetWeakPtr()),
       false);
 }
 
 base::FilePath MostVisitedSites::GetWhitelistLargeIconPath(const GURL& url) {
   for (const auto& whitelist : supervisor_->whitelists()) {
     if (AreURLsEquivalent(whitelist.entry_point, url))
       return whitelist.large_icon_path;
@@ skipping 73 matching lines @@
 
   size_t num_whitelist_suggestions = num_sites_ - num_personal_suggestions;
   SuggestionsPtrVector whitelist_suggestions;
 
   std::set<std::string> personal_hosts;
   for (const auto& suggestion : personal_suggestions)
     personal_hosts.insert(suggestion->url.host());
 
   for (const auto& whitelist : supervisor_->whitelists()) {
     // Skip blacklisted sites.
-    if (top_sites_->IsBlacklisted(whitelist.entry_point))
+    if (top_sites_ && top_sites_->IsBlacklisted(whitelist.entry_point))
       continue;
 
     // Skip suggestions already present.
     if (personal_hosts.find(whitelist.entry_point.host()) !=
         personal_hosts.end())
       continue;
 
     // Skip whitelist entry points that are manually blocked.
     if (supervisor_->IsBlocked(whitelist.entry_point))
       continue;
@@ skipping 30 matching lines @@
   SuggestionsPtrVector popular_sites_suggestions;
 
   if (num_popular_sites_suggestions > 0 && popular_sites_) {
     std::set<std::string> hosts;
     for (const auto& suggestion : personal_suggestions)
       hosts.insert(suggestion->url.host());
     for (const auto& suggestion : whitelist_suggestions)
       hosts.insert(suggestion->url.host());
     for (const PopularSites::Site& popular_site : popular_sites_->sites()) {
       // Skip blacklisted sites.
-      if (top_sites_->IsBlacklisted(popular_site.url))
+      if (top_sites_ && top_sites_->IsBlacklisted(popular_site.url))
         continue;
       std::string host = popular_site.url.host();
       // Skip suggestions already present in personal or whitelists.
       if (hosts.find(host) != hosts.end())
         continue;
 
       std::unique_ptr<Suggestion> suggestion(new Suggestion());
       suggestion->title = popular_site.title;
       suggestion->url = GURL(popular_site.url);
       suggestion->source = POPULAR;
@@ skipping 113 matching lines @@
 
 void MostVisitedSites::TopSitesLoaded(TopSites* top_sites) {}
 
 void MostVisitedSites::TopSitesChanged(TopSites* top_sites,
                                        ChangeReason change_reason) {
   if (mv_source_ == TOP_SITES) {
     // The displayed suggestions are invalidated.
     InitiateTopSitesQuery();
   }
 }