Rename VisitDatabaseObserver to HistoryServiceObserver

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/history_service.h"
@@ skipping 18 matching lines @@
 }
 
 ChromeHistoryClient::~ChromeHistoryClient() {
   if (top_sites_)
     top_sites_->RemoveObserver(this);
 }
 
 void ChromeHistoryClient::SetHistoryService(HistoryService* history_service) {
   DCHECK(history_service);
   history_service_ = history_service;
-  history_service_->AddHistoryServiceObserver(this);
+  history_service_->AddObserver(this);
 }
 
 void ChromeHistoryClient::BlockUntilBookmarksLoaded() {
   bookmark_model_->BlockTillLoaded();
 }
 
 bool ChromeHistoryClient::IsBookmarked(const GURL& url) {
   return bookmark_model_->IsBookmarked(url);
 }
 
@@ skipping 31 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();
   if (history_service_)
-    history_service_->RemoveHistoryServiceObserver(this);
+    history_service_->RemoveObserver(this);
 }
 
 // TODO(sdefresne): port client listening for NOTIFICATION_HISTORY_URL_VISITED
 // to use the HistoryService::Observer pattern instead and remove this method
 // when this is complete, http://crbug.com/42178
 void ChromeHistoryClient::OnURLVisited(ui::PageTransition transition,
                                        const history::URLRow& row,
                                        const history::RedirectList& redirects,
                                        base::Time visit_time) {
   scoped_ptr<history::URLVisitedDetails> details(
@@ skipping 14 matching lines @@
       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());
 }