| Index: chrome/browser/history/top_sites.h
|
| diff --git a/chrome/browser/history/top_sites.h b/chrome/browser/history/top_sites.h
|
| index 3f5260f714d99199fc6d36a351ca1d538c51e888..dabbe07d1f4a0dfb41e1ddff497431732d705c82 100644
|
| --- a/chrome/browser/history/top_sites.h
|
| +++ b/chrome/browser/history/top_sites.h
|
| @@ -8,11 +8,11 @@
|
| #include "base/basictypes.h"
|
| #include "base/callback.h"
|
| #include "base/gtest_prod_util.h"
|
| -#include "base/memory/ref_counted.h"
|
| #include "chrome/browser/history/history_service.h"
|
| #include "components/history/core/browser/history_types.h"
|
| #include "components/history/core/browser/top_sites_observer.h"
|
| #include "components/history/core/common/thumbnail_score.h"
|
| +#include "components/keyed_service/core/refcounted_keyed_service.h"
|
| #include "third_party/skia/include/core/SkColor.h"
|
| #include "ui/gfx/image/image.h"
|
|
|
| @@ -35,9 +35,8 @@ class TopSitesCache;
|
| //
|
| // Some methods should only be called from the UI thread (see method
|
| // descriptions below). All others are assumed to be threadsafe.
|
| -class TopSites
|
| - : public base::RefCountedThreadSafe<TopSites>,
|
| - public content::NotificationObserver {
|
| +class TopSites : public RefcountedKeyedService,
|
| + public content::NotificationObserver {
|
| public:
|
| TopSites();
|
|
|
| @@ -54,10 +53,9 @@ class TopSites
|
|
|
| // While testing the history system, we want to set the thumbnail to a piece
|
| // of static memory.
|
| - virtual bool SetPageThumbnailToJPEGBytes(
|
| - const GURL& url,
|
| - const base::RefCountedMemory* memory,
|
| - const ThumbnailScore& score) = 0;
|
| + virtual bool SetPageThumbnailToJPEGBytes(const GURL& url,
|
| + const base::RefCountedMemory* memory,
|
| + const ThumbnailScore& score) = 0;
|
|
|
| typedef base::Callback<void(const MostVisitedURLList&)>
|
| GetMostVisitedURLsCallback;
|
| @@ -67,9 +65,8 @@ class TopSites
|
| // invoked on any thread. NOTE: the callback is called immediately if we have
|
| // the data cached. If data is not available yet, callback will later be
|
| // posted to the thread called this function.
|
| - virtual void GetMostVisitedURLs(
|
| - const GetMostVisitedURLsCallback& callback,
|
| - bool include_forced_urls) = 0;
|
| + virtual void GetMostVisitedURLs(const GetMostVisitedURLsCallback& callback,
|
| + bool include_forced_urls) = 0;
|
|
|
| // Gets a thumbnail for a given page. Returns true iff we have the thumbnail.
|
| // This may be invoked on any thread.
|
|
|