Componentize TopSites, TopSitesBackend, TopSitesDatabase

chrome/browser/history/top_sites_impl.cc

 // Copyright (c) 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 "chrome/browser/history/top_sites_impl.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/md5.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
+#include "base/single_thread_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task_runner.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
@@ skipping 59 matching lines @@
 // Time from startup to first HistoryService query.
 static const int64 kUpdateIntervalSecs = 15;
 // Intervals between requests to HistoryService.
 static const int64 kMinUpdateIntervalMinutes = 1;
 static const int64 kMaxUpdateIntervalMinutes = 60;
 
 // Use 100 quality (highest quality) because we're very sensitive to
 // artifacts for these small sized, highly detailed images.
 static const int kTopSitesImageQuality = 100;
 
-TopSitesImpl::TopSitesImpl(Profile* profile)
+TopSitesImpl::TopSitesImpl(Profile* profile,
+                           const PrepopulatedPageList& prepopulated_pages)
     : backend_(NULL),
       cache_(new TopSitesCache()),
       thread_safe_cache_(new TopSitesCache()),
       profile_(profile),
       last_num_urls_changed_(0),
+      prepopulated_pages_(prepopulated_pages),
       loaded_(false) {
   if (!profile_)
     return;
 
   if (content::NotificationService::current()) {
     registrar_.Add(this, chrome::NOTIFICATION_HISTORY_URLS_DELETED,
                    content::Source<Profile>(profile_));
     // Listen for any nav commits. We'll ignore those not related to this
     // profile when we get the notification.
     registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
                    content::NotificationService::AllSources());
   }
-  for (int i = 0; i < kPrepopulatedPagesCount; i++) {
-    int url_id = kPrepopulatedPages[i].url_id;
-    prepopulated_page_urls_.push_back(
-        GURL(l10n_util::GetStringUTF8(url_id)));
-  }
 }
 
-void TopSitesImpl::Init(const base::FilePath& db_name) {
+void TopSitesImpl::Init(
+    const base::FilePath& db_name,
+    const scoped_refptr<base::SingleThreadTaskRunner>& db_task_runner) {
   // Create the backend here, rather than in the constructor, so that
   // unit tests that do not need the backend can run without a problem.
-  backend_ = new TopSitesBackend;
+  backend_ = new TopSitesBackend(db_task_runner);
   backend_->Init(db_name);
   backend_->GetMostVisitedThumbnails(
       base::Bind(&TopSitesImpl::OnGotMostVisitedThumbnails,
                  base::Unretained(this)),
       &cancelable_task_tracker_);
 }
 
 bool TopSitesImpl::SetPageThumbnail(const GURL& url,
                                     const gfx::Image& thumbnail,
                                     const ThumbnailScore& score) {
@@ skipping 101 matching lines @@
     scoped_refptr<base::RefCountedMemory>* bytes) {
   // WARNING: this may be invoked on any thread.
   // Perform exact match.
   {
     base::AutoLock lock(lock_);
     if (thread_safe_cache_->GetPageThumbnail(url, bytes))
       return true;
   }
 
   // Resource bundle is thread safe.
-  for (int i = 0; i < kPrepopulatedPagesCount; i++) {
-    if (url == prepopulated_page_urls_[i]) {
-      *bytes = ResourceBundle::GetSharedInstance().
-          LoadDataResourceBytesForScale(
-              kPrepopulatedPages[i].thumbnail_id,
-              ui::SCALE_FACTOR_100P);
+  for (const auto& prepopulated_page : prepopulated_pages_) {
+    if (url == prepopulated_page.url.url) {

[droger, 2015/01/27 10:08:36]

should this be something like:
prepopulated_page.most_visited.url

"url.url" looks weird.

[sdefresne, 2015/01/27 13:55:16]

Changed to prepopulated.most_visited.url (though there are many other
occurrences of MostVisitedURL variables named url, leading to url.url in the
history code).

+      *bytes =
+          ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
+              prepopulated_page.thumbnail_id, ui::SCALE_FACTOR_100P);
       return true;
     }
   }
 
   if (prefix_match) {
     // If http or https, search with |url| first, then try the other one.
     std::vector<GURL> url_list;
     url_list.push_back(url);
     if (url.SchemeIsHTTPOrHTTPS())
       url_list.push_back(ToggleHTTPAndHTTPS(url));
@@ skipping 320 matching lines @@
 int TopSitesImpl::GetRedirectDistanceForURL(const MostVisitedURL& most_visited,
                                             const GURL& url) {
   for (size_t i = 0; i < most_visited.redirects.size(); i++) {
     if (most_visited.redirects[i] == url)
       return static_cast<int>(most_visited.redirects.size() - i - 1);
   }
   NOTREACHED() << "URL should always be found.";
   return 0;
 }
 
-MostVisitedURLList TopSitesImpl::GetPrepopulatePages() {
-  MostVisitedURLList urls;
-  urls.resize(kPrepopulatedPagesCount);
-  for (int i = 0; i < kPrepopulatedPagesCount; ++i) {
-    MostVisitedURL& url = urls[i];
-    url.url = GURL(prepopulated_page_urls_[i]);
-    url.redirects.push_back(url.url);
-    url.title = l10n_util::GetStringUTF16(kPrepopulatedPages[i].title_id);
-  }
-  return urls;
+PrepopulatedPageList TopSitesImpl::GetPrepopulatedPages() {
+  return prepopulated_pages_;
 }
 
 bool TopSitesImpl::loaded() const {
   return loaded_;
 }
 
 bool TopSitesImpl::AddForcedURL(const GURL& url, const base::Time& time) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   size_t num_forced = cache_->GetNumForcedURLs();
   MostVisitedURLList new_list(cache_->top_sites());
@@ skipping 22 matching lines @@
   new_list.insert(mid, new_url);
   mid = new_list.begin() + num_forced;  // Mid was invalidated.
   std::inplace_merge(new_list.begin(), mid, mid + 1, ForcedURLComparator);
   SetTopSites(new_list);
   return true;
 }
 
 bool TopSitesImpl::AddPrepopulatedPages(MostVisitedURLList* urls,
                                         size_t num_forced_urls) {
   bool added = false;
-  MostVisitedURLList prepopulate_urls = GetPrepopulatePages();
-  for (size_t i = 0; i < prepopulate_urls.size(); ++i) {
+  for (const auto& prepopulated_page : prepopulated_pages_) {
     if (urls->size() - num_forced_urls < kNonForcedTopSitesNumber &&
-        IndexOf(*urls, prepopulate_urls[i].url) == -1) {
-      urls->push_back(prepopulate_urls[i]);
+        IndexOf(*urls, prepopulated_page.url.url) == -1) {
+      urls->push_back(prepopulated_page.url);
       added = true;
     }
   }
   return added;
 }
 
 size_t TopSitesImpl::MergeCachedForcedURLs(MostVisitedURLList* new_list) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // Add all the new URLs for quick lookup. Take that opportunity to count the
   // number of forced URLs in |new_list|.
@@ skipping 62 matching lines @@
   }
 }
 
 std::string TopSitesImpl::GetURLHash(const GURL& url) {
   // We don't use canonical URLs here to be able to blacklist only one of
   // the two 'duplicate' sites, e.g. 'gmail.com' and 'mail.google.com'.
   return base::MD5String(url.spec());
 }
 
 base::TimeDelta TopSitesImpl::GetUpdateDelay() {
-  if (cache_->top_sites().size() <= kPrepopulatedPagesCount)
+  if (cache_->top_sites().size() <= prepopulated_pages_.size())
     return base::TimeDelta::FromSeconds(30);
 
   int64 range = kMaxUpdateIntervalMinutes - kMinUpdateIntervalMinutes;
   int64 minutes = kMaxUpdateIntervalMinutes -
       last_num_urls_changed_ * range / cache_->top_sites().size();
   return base::TimeDelta::FromMinutes(minutes);
 }
 
 void TopSitesImpl::Observe(int type,
                            const content::NotificationSource& source,
@@ skipping 178 matching lines @@
       base::TimeDelta::FromSeconds(kUpdateIntervalSecs));
 }
 
 void TopSitesImpl::OnTopSitesAvailableFromHistory(
     const MostVisitedURLList* pages) {
   DCHECK(pages);
   SetTopSites(*pages);
 }
 
 }  // namespace history