Topsites become keyedService based.

chrome/browser/android/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 "chrome/browser/android/most_visited_sites.h"
 
 #include <string>
 #include <vector>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/history/top_sites.h"
+#include "chrome/browser/history/top_sites_provider.h"
+#include "chrome/browser/history/top_sites_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "chrome/browser/search/suggestions/suggestions_service_factory.h"
 #include "chrome/browser/search/suggestions/suggestions_source.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/thumbnails/thumbnail_list_source.h"
 #include "components/suggestions/suggestions_service.h"
 #include "components/suggestions/suggestions_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/url_data_source.h"
 #include "jni/MostVisitedSites_jni.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ToJavaArrayOfStrings;
 using base::android::CheckException;
 using content::BrowserThread;
-using history::TopSites;
+using history::TopSitesProvider;
 using suggestions::ChromeSuggestion;
 using suggestions::SuggestionsProfile;
 using suggestions::SuggestionsService;
 using suggestions::SuggestionsServiceFactory;
 using suggestions::SyncState;
 
 namespace {
 
 // Total number of tiles displayed.
 const char kNumTilesHistogramName[] = "NewTabPage.NumberOfTiles";
@@ skipping 41 matching lines @@
   }
 }
 
 SkBitmap ExtractThumbnail(const base::RefCountedMemory& image_data) {
   scoped_ptr<SkBitmap> image(gfx::JPEGCodec::Decode(
       image_data.front(),
       image_data.size()));
   return image.get() ? *image : SkBitmap();
 }
 
-void AddForcedURLOnUIThread(scoped_refptr<history::TopSites> top_sites,
-                            const GURL& url) {
+void AddForcedURLOnUIThread(
+    scoped_refptr<history::TopSitesProvider> top_sites_provider,
+    const GURL& url) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  top_sites->AddForcedURL(url, base::Time::Now());
+  top_sites_provider->AddForcedURL(url, base::Time::Now());
 }
 
 // Runs on the DB thread.
 void GetUrlThumbnailTask(
     std::string url_string,
-    scoped_refptr<TopSites> top_sites,
+    scoped_refptr<TopSitesProvider> top_sites_provider,
     ScopedJavaGlobalRef<jobject>* j_callback,
     MostVisitedSites::LookupSuccessCallback lookup_success_ui_callback,
     base::Closure lookup_failed_ui_callback) {
   JNIEnv* env = AttachCurrentThread();
 
   ScopedJavaGlobalRef<jobject>* j_bitmap_ref =
       new ScopedJavaGlobalRef<jobject>();
 
   GURL gurl(url_string);
 
   scoped_refptr<base::RefCountedMemory> data;
-  if (top_sites->GetPageThumbnail(gurl, false, &data)) {
+  if (top_sites_provider->GetPageThumbnail(gurl, false, &data)) {
     SkBitmap thumbnail_bitmap = ExtractThumbnail(*data.get());
     if (!thumbnail_bitmap.empty()) {
       j_bitmap_ref->Reset(
           env,
           gfx::ConvertToJavaBitmap(&thumbnail_bitmap).obj());
     }
   } else {
     // A thumbnail is not locally available for |gurl|. Make sure it is put in
     // the list to be fetched at the next visit to this site.
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
-        base::Bind(AddForcedURLOnUIThread, top_sites, gurl));
+        base::Bind(AddForcedURLOnUIThread, top_sites_provider, gurl));
 
     // If appropriate, return on the UI thread to execute the proper callback.
     if (!lookup_failed_ui_callback.is_null()) {
       BrowserThread::PostTask(
           BrowserThread::UI, FROM_HERE, lookup_failed_ui_callback);
       delete j_bitmap_ref;
       return;
     }
   }
 
@@ skipping 72 matching lines @@
 
 void MostVisitedSites::SetMostVisitedURLsObserver(JNIEnv* env,
                                                   jobject obj,
                                                   jobject j_observer,
                                                   jint num_sites) {
   observer_.Reset(env, j_observer);
   num_sites_ = num_sites;
 
   QueryMostVisitedURLs();
 
-  history::TopSites* top_sites = profile_->GetTopSites();
-  if (top_sites) {
+  history::TopSitesProvider* top_sites_provider =
+      TopSitesServiceFactory::GetForProfile(profile_);
+  if (top_sites_provider) {
     // TopSites updates itself after a delay. To ensure up-to-date results,
     // force an update now.
-    top_sites->SyncWithHistory();
+    top_sites_provider->SyncWithHistory();
 
     // Register for notification when TopSites changes so that we can update
     // ourself.
-    registrar_.Add(this, chrome::NOTIFICATION_TOP_SITES_CHANGED,
-                   content::Source<history::TopSites>(top_sites));
+    registrar_.Add(
+        this, chrome::NOTIFICATION_TOP_SITES_CHANGED,
+        content::Source<history::TopSitesProvider>(top_sites_provider));
   }
 }
 
 // Called from the UI Thread.
 void MostVisitedSites::GetURLThumbnail(JNIEnv* env,
                                        jobject obj,
                                        jstring url,
                                        jobject j_callback_obj) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   ScopedJavaGlobalRef<jobject>* j_callback =
       new ScopedJavaGlobalRef<jobject>();
   j_callback->Reset(env, j_callback_obj);
 
   std::string url_string = ConvertJavaStringToUTF8(env, url);
-  scoped_refptr<TopSites> top_sites(profile_->GetTopSites());
+  scoped_refptr<TopSitesProvider> top_sites_provider(
+      TopSitesServiceFactory::GetForProfile(profile_));
 
   // If the Suggestions service is enabled and in use, create a callback to
   // fetch a server thumbnail from it, in case the local thumbnail is not found.
   SuggestionsService* suggestions_service =
       SuggestionsServiceFactory::GetForProfile(profile_);
   bool use_suggestions_service = suggestions_service &&
       mv_source_ == SUGGESTIONS_SERVICE;
   base::Closure lookup_failed_callback = use_suggestions_service ?
       base::Bind(&MostVisitedSites::GetSuggestionsThumbnailOnUIThread,
                  weak_ptr_factory_.GetWeakPtr(),
                  suggestions_service, url_string,
                  base::Owned(new ScopedJavaGlobalRef<jobject>(*j_callback))) :
       base::Closure();
   LookupSuccessCallback lookup_success_callback =
       base::Bind(&MostVisitedSites::OnObtainedThumbnail,
                  weak_ptr_factory_.GetWeakPtr());
 
   BrowserThread::PostTask(
       BrowserThread::DB, FROM_HERE,
-          base::Bind(
-              &GetUrlThumbnailTask, url_string, top_sites,
-              base::Owned(j_callback), lookup_success_callback,
-              lookup_failed_callback));
+      base::Bind(&GetUrlThumbnailTask, url_string, top_sites_provider,
+                 base::Owned(j_callback), lookup_success_callback,
+                 lookup_failed_callback));
 }
 
 void MostVisitedSites::BlacklistUrl(JNIEnv* env,
                                     jobject obj,
                                     jstring j_url) {
   std::string url = ConvertJavaStringToUTF8(env, j_url);
 
   switch (mv_source_) {
     case TOP_SITES: {
-      TopSites* top_sites = profile_->GetTopSites();
-      DCHECK(top_sites);
-      top_sites->AddBlacklistedURL(GURL(url));
+      TopSitesProvider* top_sites_provider =
+          TopSitesServiceFactory::GetForProfile(profile_);
+      DCHECK(top_sites_provider);
+      top_sites_provider->AddBlacklistedURL(GURL(url));
       break;
     }
 
     case SUGGESTIONS_SERVICE: {
       SuggestionsService* suggestions_service =
           SuggestionsServiceFactory::GetForProfile(profile_);
       DCHECK(suggestions_service);
       suggestions_service->BlacklistURL(
           GURL(url),
           base::Bind(
@@ skipping 65 matching lines @@
         base::Bind(
           &MostVisitedSites::OnSuggestionsProfileAvailable,
           weak_ptr_factory_.GetWeakPtr(),
           base::Owned(new ScopedJavaGlobalRef<jobject>(observer_))));
   } else {
     InitiateTopSitesQuery();
   }
 }
 
 void MostVisitedSites::InitiateTopSitesQuery() {
-  TopSites* top_sites = profile_->GetTopSites();
-  if (!top_sites)
+  TopSitesProvider* top_sites_provider =
+      TopSitesServiceFactory::GetForProfile(profile_);
+  if (!top_sites_provider)
     return;
 
-  top_sites->GetMostVisitedURLs(
-      base::Bind(
-          &MostVisitedSites::OnMostVisitedURLsAvailable,
-          weak_ptr_factory_.GetWeakPtr(),
-          base::Owned(new ScopedJavaGlobalRef<jobject>(observer_)),
-          num_sites_),
+  top_sites_provider->GetMostVisitedURLs(
+      base::Bind(&MostVisitedSites::OnMostVisitedURLsAvailable,
+                 weak_ptr_factory_.GetWeakPtr(),
+                 base::Owned(new ScopedJavaGlobalRef<jobject>(observer_)),
+                 num_sites_),
       false);
 }
 
 void MostVisitedSites::OnMostVisitedURLsAvailable(
     ScopedJavaGlobalRef<jobject>* j_observer,
     int num_sites,
     const history::MostVisitedURLList& visited_list) {
   std::vector<base::string16> titles;
   std::vector<std::string> urls;
   ExtractMostVisitedTitlesAndURLs(visited_list, &titles, &urls, num_sites);
@@ skipping 127 matching lines @@
   num_empty_thumbs_ = 0;
   UMA_HISTOGRAM_SPARSE_SLOWLY(kNumServerTilesHistogramName, num_server_thumbs_);
   num_server_thumbs_ = 0;
 }
 
 static jlong Init(JNIEnv* env, jobject obj, jobject jprofile) {
   MostVisitedSites* most_visited_sites =
       new MostVisitedSites(ProfileAndroid::FromProfileAndroid(jprofile));
   return reinterpret_cast<intptr_t>(most_visited_sites);
 }