Remove TopSites notification in favor of Observers

chrome/browser/history/chrome_history_client.cc

 // 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.
 
 #include "chrome/browser/history/chrome_history_client.h"
 
 #include "base/logging.h"
-#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/history/history_notifications.h"
-#include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/ui/profile_error_dialog.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/bookmarks/browser/bookmark_model.h"
-#include "content/public/browser/notification_service.h"
 
-using bookmarks::BookmarkModel;
-
-ChromeHistoryClient::ChromeHistoryClient(BookmarkModel* bookmark_model,
-                                         Profile* profile,
-                                         history::TopSites* top_sites)
-    : bookmark_model_(bookmark_model),
-      profile_(profile),
-      top_sites_(top_sites) {
+ChromeHistoryClient::ChromeHistoryClient(
+    bookmarks::BookmarkModel* bookmark_model)
+    : bookmark_model_(bookmark_model) {
   DCHECK(bookmark_model_);
-  if (top_sites_)
-    top_sites_->AddObserver(this);
 }
 
 ChromeHistoryClient::~ChromeHistoryClient() {
-  if (top_sites_)
-    top_sites_->RemoveObserver(this);
 }
 
 void ChromeHistoryClient::BlockUntilBookmarksLoaded() {
   bookmark_model_->BlockTillLoaded();
 }
 
 bool ChromeHistoryClient::IsBookmarked(const GURL& url) {
   return bookmark_model_->IsBookmarked(url);
 }
 
 void ChromeHistoryClient::GetBookmarks(
     std::vector<history::URLAndTitle>* bookmarks) {
-  std::vector<BookmarkModel::URLAndTitle> bookmarks_url_and_title;
+  std::vector<bookmarks::BookmarkModel::URLAndTitle> bookmarks_url_and_title;
   bookmark_model_->GetBookmarks(&bookmarks_url_and_title);
 
   bookmarks->reserve(bookmarks->size() + bookmarks_url_and_title.size());
   for (size_t i = 0; i < bookmarks_url_and_title.size(); ++i) {
     history::URLAndTitle value = {
       bookmarks_url_and_title[i].url,
       bookmarks_url_and_title[i].title,
     };
     bookmarks->push_back(value);
   }
@@ skipping 18 matching lines @@
 void ChromeHistoryClient::Shutdown() {
   // It's possible that bookmarks haven't loaded and history is waiting for
   // bookmarks to complete loading. In such a situation history can't shutdown
   // (meaning if we invoked HistoryService::Cleanup now, we would deadlock). To
   // break the deadlock we tell BookmarkModel it's about to be deleted so that
   // it can release the signal history is waiting on, allowing history to
   // shutdown (HistoryService::Cleanup to complete). In such a scenario history
   // sees an incorrect view of bookmarks, but it's better than a deadlock.
   bookmark_model_->Shutdown();
 }
-
-void ChromeHistoryClient::TopSitesLoaded(history::TopSites* top_sites) {
-  content::NotificationService::current()->Notify(
-      chrome::NOTIFICATION_TOP_SITES_LOADED,
-      content::Source<Profile>(profile_),
-      content::Details<history::TopSites>(top_sites));
-}
-
-void ChromeHistoryClient::TopSitesChanged(history::TopSites* top_sites) {
-  content::NotificationService::current()->Notify(
-      chrome::NOTIFICATION_TOP_SITES_CHANGED,
-      content::Source<history::TopSites>(top_sites),
-      content::NotificationService::NoDetails());
-}