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_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"
@@ skipping 192 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) {
+  scoped_refptr<history::TopSites> top_sites =
+      TopSitesServiceFactory::GetForProfile(profile_);
+  if (top_sites.get()) {
     // TopSites updates itself after a delay. To ensure up-to-date results,
     // force an update now.
     top_sites->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));
+                   content::Source<history::TopSites>(top_sites.get()));
   }
 }
 
 // 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<TopSites> top_sites(
+      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,
+                 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);
+      scoped_refptr<TopSites> top_sites =
+          TopSitesServiceFactory::GetForProfile(profile_);
+      DCHECK(top_sites.get());
       top_sites->AddBlacklistedURL(GURL(url));
       break;
     }
 
     case SUGGESTIONS_SERVICE: {
       SuggestionsService* suggestions_service =
           SuggestionsServiceFactory::GetForProfile(profile_);
       DCHECK(suggestions_service);
       suggestions_service->BlacklistURL(
           GURL(url),
@@ skipping 66 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)
+  scoped_refptr<TopSites> top_sites =
+      TopSitesServiceFactory::GetForProfile(profile_);
+  if (top_sites.get() == NULL)

[sdefresne, 2014/12/29 09:48:14]

nit: "if (!top_sites)" should work here and everywhere else.

[Jitu( very slow this week), 2014/12/30 10:09:02]

Done.

     return;
 
   top_sites->GetMostVisitedURLs(
-      base::Bind(
-          &MostVisitedSites::OnMostVisitedURLsAvailable,
-          weak_ptr_factory_.GetWeakPtr(),
-          base::Owned(new ScopedJavaGlobalRef<jobject>(observer_)),
-          num_sites_),
+      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);
 }