Remove TopSites notification in favor of Observers

chrome/browser/search/instant_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_SEARCH_INSTANT_SERVICE_H_
 #define CHROME_BROWSER_SEARCH_INSTANT_SERVICE_H_
 
 #include <set>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "components/history/core/browser/history_types.h"
+#include "components/history/core/browser/top_sites_observer.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/search_engines/template_url_service_observer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "url/gurl.h"
 
 class InstantIOContext;
 struct InstantMostVisitedItem;
 class InstantSearchPrerenderer;
 class InstantServiceObserver;
 class Profile;
 struct TemplateURLData;
 class TemplateURLService;
 struct ThemeBackgroundInfo;
 class ThemeService;
 
 namespace content {
 class RenderProcessHost;
 }
 
 // Tracks render process host IDs that are associated with Instant.
 class InstantService : public KeyedService,
                        public content::NotificationObserver,
-                       public TemplateURLServiceObserver {
+                       public TemplateURLServiceObserver,
+                       public history::TopSitesObserver {
  public:
   explicit InstantService(Profile* profile);
   ~InstantService() override;
 
   // Add, remove, and query RenderProcessHost IDs that are associated with
   // Instant processes.
   void AddInstantProcess(int process_id);
   bool IsInstantProcess(int process_id) const;
 
   // Adds/Removes InstantService observers.
@@ skipping 62 matching lines @@
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
   // TemplateURLServiceObserver:
   // Caches the previous value of the Default Search Provider and the Google
   // base URL to filter out changes other than those affecting the Default
   // Search Provider.
   void OnTemplateURLServiceChanged() override;
 
+  // TopSitesObserver:
+  void TopSitesLoaded(history::TopSites* top_sites) override;
+  void TopSitesChanged(history::TopSites* top_sites) override;
+
   // Called when a renderer process is terminated.
   void OnRendererProcessTerminated(int process_id);
 
   // Called when we get new most visited items from TopSites, registered as an
   // async callback. Parses them and sends them to the renderer via
   // SendMostVisitedItems.
   void OnMostVisitedItemsReceived(const history::MostVisitedURLList& data);
 
   // Notifies the observer about the last known most visited items.
   void NotifyAboutMostVisitedItems();
@@ skipping 36 matching lines @@
   scoped_ptr<TemplateURLData> previous_default_search_provider_;
   GURL previous_google_base_url_;
 
   // Used for Top Sites async retrieval.
   base::WeakPtrFactory<InstantService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantService);
 };
 
 #endif  // CHROME_BROWSER_SEARCH_INSTANT_SERVICE_H_