Topsites become keyedService based.

chrome/browser/jumplist_win.cc

 // Copyright 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/jumplist_win.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/metrics/field_trial.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/top_sites.h"
+#include "chrome/browser/history/top_sites_factory.h"
 #include "chrome/browser/metrics/jumplist_metrics_win.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
@@ skipping 208 matching lines @@
   // from the observer list.
   TabRestoreService* tab_restore_service =
       TabRestoreServiceFactory::GetForProfile(profile_);
   if (!tab_restore_service)
     return;
 
   app_id_ = ShellIntegration::GetChromiumModelIdForProfile(profile_->GetPath());
   icon_dir_ = profile_->GetPath().Append(chrome::kJumpListIconDirname);
   use_profiles_category_ = HasProfilesJumplistExperiment();
 
-  history::TopSites* top_sites = profile_->GetTopSites();
-  if (top_sites) {
+  scoped_refptr<history::TopSites> top_sites =
+      TopSitesFactory::GetForProfile(profile_);
+  if (top_sites.get()) {
     // TopSites updates itself after a delay. This is especially noticable when
     // your profile is empty. Ask TopSites to update itself when jumplist is
     // initialized.
     top_sites->SyncWithHistory();
     registrar_.reset(new content::NotificationRegistrar);
     // 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()));
     // Register for notification when profile is destroyed to ensure that all
     // observers are detatched at that time.
     registrar_->Add(this, chrome::NOTIFICATION_PROFILE_DESTROYED,
                     content::Source<Profile>(profile_));
   }
   tab_restore_service->AddObserver(this);
   pref_change_registrar_.reset(new PrefChangeRegistrar);
   pref_change_registrar_->Init(profile_->GetPrefs());
   pref_change_registrar_->Add(
       prefs::kIncognitoModeAvailability,
@@ skipping 14 matching lines @@
 bool JumpList::Enabled() {
   return JumpListUpdater::IsEnabled();
 }
 
 void JumpList::Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_TOP_SITES_CHANGED: {
       // Most visited urls changed, query again.
-      history::TopSites* top_sites = profile_->GetTopSites();
-      if (top_sites) {
+      scoped_refptr<history::TopSites> top_sites =
+          TopSitesFactory::GetForProfile(profile_);
+      if (top_sites.get()) {
         top_sites->GetMostVisitedURLs(
             base::Bind(&JumpList::OnMostVisitedURLsAvailable,
                        weak_ptr_factory_.GetWeakPtr()), false);
       }
       break;
     }
     case chrome::NOTIFICATION_PROFILE_DESTROYED: {
       // Profile was destroyed, do clean-up.
       Terminate();
       break;
@@ skipping 292 matching lines @@
       link->set_icon_data(avatar.AsBitmap());
       new_profile_switcher.push_back(link);
     }
   }
 
   {
     base::AutoLock auto_lock(list_lock_);
     new_profile_switcher.swap(profile_switcher_);
   }
 }