Topsites become keyedService based.

chrome/browser/history/top_sites_provider.h

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.

[sdefresne, 2014/12/19 15:11:40]

Do not change copyright notice when renaming files.

+// Copyright 2014 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.
 
-#ifndef CHROME_BROWSER_HISTORY_TOP_SITES_H_
-#define CHROME_BROWSER_HISTORY_TOP_SITES_H_
+#ifndef CHROME_BROWSER_HISTORY_TOP_SITES_PROVIDER_H_
+#define CHROME_BROWSER_HISTORY_TOP_SITES_PROVIDER_H_
 
 #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 "third_party/skia/include/core/SkColor.h"
@@ skipping 11 matching lines @@
 namespace history {
 
 class TopSitesCache;
 
 // Interface for TopSites, which stores the data for the top "most visited"
 // sites. This includes a cache of the most visited data from history, as well
 // as the corresponding thumbnails of those sites.
 //
 // Some methods should only be called from the UI thread (see method
 // descriptions below). All others are assumed to be threadsafe.
-class TopSites

[sdefresne, 2014/12/19 15:11:40]

This class must be the KeyedService, not TopSitesService.

-    : public base::RefCountedThreadSafe<TopSites>,
-      public content::NotificationObserver {
+class TopSitesProvider : public base::RefCountedThreadSafe<TopSitesProvider>,

[sdefresne, 2014/12/19 15:11:40]

Why did you rename this class from TopSites to TopSitesProvider. I don't see the
benefit. If you really think this make the code easier to understand, please do
it as a separate change list to keep this one manageable.

[sdefresne, 2014/12/19 15:11:40]

Why did you rename this class from TopSites to TopSitesProvider. I don't see the
benefit. If you really think this make the code easier to understand, please do
it as a separate change list to keep this one manageable.

+                         public content::NotificationObserver {
  public:
-  TopSites();
+  TopSitesProvider() {}

[sdefresne, 2014/12/19 15:11:40]

Do not inline complex constructors.

 
   // Initializes TopSites.
-  static TopSites* Create(Profile* profile, const base::FilePath& db_name);
+  static TopSitesProvider* Create(Profile* profile,
+                                  const base::FilePath& db_name);
 
   // Sets the given thumbnail for the given URL. Returns true if the thumbnail
   // was updated. False means either the URL wasn't known to us, or we felt
   // that our current thumbnail was superior to the given one. Should be called
   // from the UI thread.
   virtual bool SetPageThumbnail(const GURL& url,
                                 const gfx::Image& thumbnail,
                                 const ThumbnailScore& score) = 0;
 
   // 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;
 
   // Returns a list of most visited URLs via a callback, if
   // |include_forced_urls| is false includes only non-forced URLs. This may be
   // 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.
   // If an exact thumbnail URL match fails, |prefix_match| specifies whether or
   // not to try harder by matching the query thumbnail URL as URL prefix (as
   // defined by UrlIsPrefix()).
   // As this method may be invoked on any thread the ref count needs to be
   // incremented before this method returns, so this takes a scoped_refptr*.
   virtual bool GetPageThumbnail(
       const GURL& url,
@@ skipping 88 matching lines @@
 
   // Add Observer to the list.
   void AddObserver(TopSitesObserver* observer);
 
   // Remove Observer from the list.
   void RemoveObserver(TopSitesObserver* observer);
 
  protected:
   void NotifyTopSitesLoaded();
   void NotifyTopSitesChanged();
-  ~TopSites() override;
+  ~TopSitesProvider() override;
 
  private:
   ObserverList<TopSitesObserver> observer_list_;
-  friend class base::RefCountedThreadSafe<TopSites>;
+  friend class base::RefCountedThreadSafe<TopSitesProvider>;
 };
 
 #if defined(OS_ANDROID)
 const int kPrepopulatedPagesCount = 0;
 #else
 const int kPrepopulatedPagesCount = 2;
 #endif
-extern const TopSites::PrepopulatedPage
+extern const TopSitesProvider::PrepopulatedPage
     kPrepopulatedPages[kPrepopulatedPagesCount];
 
 }  // namespace history
 
-#endif  // CHROME_BROWSER_HISTORY_TOP_SITES_H_
+#endif  // CHROME_BROWSER_HISTORY_TOP_SITES_PROVIDER_H_