Inject CanAddURLToHistory into TopSitesImpl

components/history/core/browser/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 "components/history/core/browser/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/history/history_utils.h"
 #include "components/history/core/browser/history_backend.h"
 #include "components/history/core/browser/history_db_task.h"
 #include "components/history/core/browser/page_usage_data.h"
 #include "components/history/core/browser/top_sites_cache.h"
 #include "components/history/core/browser/url_utils.h"
 #include "components/history/core/common/thumbnail_score.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_util.h"
@@ skipping 47 matching lines @@
 const int kTopSitesImageQuality = 100;
 
 }  // namespace
 
 // Initially, histogram is not recorded.
 bool TopSitesImpl::histogram_recorded_ = false;
 
 TopSitesImpl::TopSitesImpl(PrefService* pref_service,
                            HistoryService* history_service,
                            const char* blacklist_pref_name,
-                           const PrepopulatedPageList& prepopulated_pages)
+                           const PrepopulatedPageList& prepopulated_pages,
+                           const CanAddURLToHistoryFn& can_add_url_to_history)
     : backend_(nullptr),
       cache_(new TopSitesCache()),
       thread_safe_cache_(new TopSitesCache()),
       last_num_urls_changed_(0),
       prepopulated_pages_(prepopulated_pages),
       pref_service_(pref_service),
       blacklist_pref_name_(blacklist_pref_name),
       history_service_(history_service),
+      can_add_url_to_history_(can_add_url_to_history),
       loaded_(false),
       history_service_observer_(this) {
   DCHECK(pref_service_);
   DCHECK(blacklist_pref_name_);
+  DCHECK(!can_add_url_to_history_.is_null());
 }
 
 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(db_task_runner);
   backend_->Init(db_name);
   backend_->GetMostVisitedThumbnails(
@@ skipping 15 matching lines @@
 
   bool add_temp_thumbnail = false;
   if (!IsKnownURL(url)) {
     if (!IsNonForcedFull()) {
       add_temp_thumbnail = true;
     } else {
       return false;  // This URL is not known to us.
     }
   }
 
-  if (!CanAddURLToHistory(url))
+  if (!can_add_url_to_history_.Run(url))
     return false;  // It's not a real webpage.
 
   scoped_refptr<base::RefCountedBytes> thumbnail_data;
   if (!EncodeBitmap(thumbnail, &thumbnail_data))
     return false;
 
   if (add_temp_thumbnail) {
     // Always remove the existing entry and then add it back. That way if we end
     // up with too many temp thumbnails we'll prune the oldest first.
     RemoveTemporaryThumbnailByURL(url);
@@ skipping 18 matching lines @@
 
   bool add_temp_thumbnail = false;
   if (!IsKnownURL(url)) {
     if (!IsNonForcedFull()) {
       add_temp_thumbnail = true;
     } else {
       return false;  // This URL is not known to us.
     }
   }
 
-  if (!CanAddURLToHistory(url))
+  if (!can_add_url_to_history_.Run(url))
     return false;  // It's not a real webpage.
 
   if (add_temp_thumbnail) {
     // Always remove the existing entry and then add it back. That way if we end
     // up with too many temp thumbnails we'll prune the oldest first.
     RemoveTemporaryThumbnailByURL(url);
     AddTemporaryThumbnail(url, memory, score);
     return true;
   }
 
@@ skipping 414 matching lines @@
   std::inplace_merge(new_list.begin(), mid, mid + 1, ForcedURLComparator);
   SetTopSites(new_list, CALL_LOCATION_FROM_OTHER_PLACES);
   return true;
 }
 
 void TopSitesImpl::OnNavigationCommitted(const GURL& url) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!loaded_ || IsNonForcedFull())
     return;
 
-  if (!cache_->IsKnownURL(url) && CanAddURLToHistory(url)) {
+  if (!cache_->IsKnownURL(url) && can_add_url_to_history_.Run(url)) {
     // To avoid slamming history we throttle requests when the url updates. To
     // do otherwise negatively impacts perf tests.
     RestartQueryForTopSitesTimer(GetUpdateDelay());
   }
 }
 
 bool TopSitesImpl::AddPrepopulatedPages(MostVisitedURLList* urls,
                                         size_t num_forced_urls) {
   bool added = false;
   for (const auto& prepopulated_page : prepopulated_pages_) {
@@ skipping 278 matching lines @@
     for (std::set<size_t>::reverse_iterator i = indices_to_delete.rbegin();
          i != indices_to_delete.rend(); i++) {
       new_top_sites.erase(new_top_sites.begin() + *i);
     }
     SetTopSites(new_top_sites, CALL_LOCATION_FROM_OTHER_PLACES);
   }
   StartQueryForMostVisited();
 }
 
 }  // namespace history