Topsites become keyedService based.

chrome/browser/ui/webui/ntp/most_visited_handler.cc

 // Copyright (c) 2012 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/ui/webui/ntp/most_visited_handler.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/md5.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/history/top_sites.h"
+#include "chrome/browser/history/top_sites_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/thumbnails/thumbnail_list_source.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_utils.h"
 #include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 #include "chrome/browser/ui/webui/ntp/ntp_stats.h"
 #include "chrome/browser/ui/webui/ntp/thumbnail_source.h"
@@ skipping 41 matching lines @@
   content::URLDataSource::Add(profile, new ThumbnailSource(profile, false));
   content::URLDataSource::Add(profile, new ThumbnailSource(profile, true));
 
   // Set up our sources for top-sites data.
   content::URLDataSource::Add(profile, new ThumbnailListSource(profile));
 
   // Register chrome://favicon as a data source for favicons.
   content::URLDataSource::Add(
       profile, new FaviconSource(profile, FaviconSource::FAVICON));
 
-  history::TopSites* ts = profile->GetTopSites();
-  if (ts) {
+  scoped_refptr<history::TopSites> ts = TopSitesFactory::GetForProfile(profile);
+  if (ts.get()) {

[Bernhard Bauer, 2015/01/08 10:22:05]

Remove .get().

[Jitu( very slow this week), 2015/01/12 11:30:08]

Done.

     // TopSites updates itself after a delay. This is especially noticable when
     // your profile is empty. Ask TopSites to update itself when we're about to
     // show the new tab page.
     ts->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>(ts));
+                   content::Source<history::TopSites>(ts.get()));

[Bernhard Bauer, 2015/01/08 10:22:05]

Remove .get().

[Jitu( very slow this week), 2015/01/12 11:30:08]

Done.

   }
 
   // We pre-emptively make a fetch for the most visited pages so we have the
   // results sooner.
   StartQueryForMostVisited();
 
   web_ui()->RegisterMessageCallback("getMostVisited",
       base::Bind(&MostVisitedHandler::HandleGetMostVisited,
                  base::Unretained(this)));
 
@@ skipping 24 matching lines @@
     StartQueryForMostVisited();
   }
 }
 
 void MostVisitedHandler::SendPagesValue() {
   if (pages_value_) {
     Profile* profile = Profile::FromWebUI(web_ui());
     const base::DictionaryValue* url_blacklist =
         profile->GetPrefs()->GetDictionary(prefs::kNtpMostVisitedURLsBlacklist);
     bool has_blacklisted_urls = !url_blacklist->empty();
-    history::TopSites* ts = profile->GetTopSites();
-    if (ts)
+    scoped_refptr<history::TopSites> ts =
+        TopSitesFactory::GetForProfile(profile);
+    if (ts.get())

[Bernhard Bauer, 2015/01/08 10:22:05]

Remove .get().

[Jitu( very slow this week), 2015/01/12 11:30:08]

Done.

       has_blacklisted_urls = ts->HasBlacklistedItems();
 
     base::FundamentalValue has_blacklisted_urls_value(has_blacklisted_urls);
     web_ui()->CallJavascriptFunction("ntp.setMostVisitedPages",
                                      *pages_value_,
                                      has_blacklisted_urls_value);
     pages_value_.reset();
   }
 }
 
 void MostVisitedHandler::StartQueryForMostVisited() {
-  history::TopSites* ts = Profile::FromWebUI(web_ui())->GetTopSites();
-  if (ts) {
+  scoped_refptr<history::TopSites> ts =
+      TopSitesFactory::GetForProfile(Profile::FromWebUI(web_ui()));
+  if (ts.get()) {

[Bernhard Bauer, 2015/01/08 10:22:05]

Remove .get().

[Jitu( very slow this week), 2015/01/12 11:30:08]

Done.

     ts->GetMostVisitedURLs(
         base::Bind(&MostVisitedHandler::OnMostVisitedUrlsAvailable,
                    weak_ptr_factory_.GetWeakPtr()), false);
   }
 }
 
 void MostVisitedHandler::HandleBlacklistUrl(const base::ListValue* args) {
   std::string url = base::UTF16ToUTF8(ExtractStringValue(args));
   BlacklistUrl(GURL(url));
 }
 
 void MostVisitedHandler::HandleRemoveUrlsFromBlacklist(
     const base::ListValue* args) {
   DCHECK(args->GetSize() != 0);
 
   for (base::ListValue::const_iterator iter = args->begin();
        iter != args->end(); ++iter) {
     std::string url;
     bool r = (*iter)->GetAsString(&url);
     if (!r) {
       NOTREACHED();
       return;
     }
     content::RecordAction(UserMetricsAction("MostVisited_UrlRemoved"));
-    history::TopSites* ts = Profile::FromWebUI(web_ui())->GetTopSites();
-    if (ts)
+    scoped_refptr<history::TopSites> ts =
+        TopSitesFactory::GetForProfile(Profile::FromWebUI(web_ui()));
+    if (ts.get())

[Bernhard Bauer, 2015/01/08 10:22:05]

Remove .get().

[Jitu( very slow this week), 2015/01/12 11:30:08]

Done.

       ts->RemoveBlacklistedURL(GURL(url));
   }
 }
 
 void MostVisitedHandler::HandleClearBlacklist(const base::ListValue* args) {
   content::RecordAction(UserMetricsAction("MostVisited_BlacklistCleared"));
 
-  history::TopSites* ts = Profile::FromWebUI(web_ui())->GetTopSites();
-  if (ts)
+  scoped_refptr<history::TopSites> ts =
+      TopSitesFactory::GetForProfile(Profile::FromWebUI(web_ui()));
+  if (ts.get())

[Bernhard Bauer, 2015/01/08 10:22:05]

Remove .get().

[Jitu( very slow this week), 2015/01/12 11:30:08]

Done.

     ts->ClearBlacklistedURLs();
 }
 
 void MostVisitedHandler::HandleMostVisitedAction(const base::ListValue* args) {
   DCHECK(args);
 
   double action_id;
   if (!args->GetDouble(0, &action_id))
     NOTREACHED();
 
@@ skipping 45 matching lines @@
 void MostVisitedHandler::Observe(int type,
                                  const content::NotificationSource& source,
                                  const content::NotificationDetails& details) {
   DCHECK_EQ(type, chrome::NOTIFICATION_TOP_SITES_CHANGED);
 
   // Most visited urls changed, query again.
   StartQueryForMostVisited();
 }
 
 void MostVisitedHandler::BlacklistUrl(const GURL& url) {
-  history::TopSites* ts = Profile::FromWebUI(web_ui())->GetTopSites();
-  if (ts)
+  scoped_refptr<history::TopSites> ts =
+      TopSitesFactory::GetForProfile(Profile::FromWebUI(web_ui()));
+  if (ts.get())

[Bernhard Bauer, 2015/01/08 10:22:05]

Remove .get().

[Jitu( very slow this week), 2015/01/12 11:30:08]

Done.

     ts->AddBlacklistedURL(url);
   content::RecordAction(UserMetricsAction("MostVisited_UrlBlacklisted"));
 }
 
 std::string MostVisitedHandler::GetDictionaryKeyForUrl(const std::string& url) {
   return base::MD5String(url);
 }
 
 // static
 void MostVisitedHandler::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterDictionaryPref(
       prefs::kNtpMostVisitedURLsBlacklist,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }