Rename VisitDatabaseObserver to HistoryServiceObserver

chrome/browser/history/chrome_history_client.h

 // 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_CHROME_HISTORY_CLIENT_H_
 #define CHROME_BROWSER_HISTORY_CHROME_HISTORY_CLIENT_H_
 
 #include "base/macros.h"
+#include "chrome/browser/history/history_service.h"
 #include "components/history/core/browser/history_client.h"
-#include "components/history/core/browser/history_service_observer.h"
 #include "components/history/core/browser/top_sites_observer.h"
 
 class BookmarkModel;
 class HistoryService;
 class Profile;
 
 namespace history {
 class TopSites;
 }
 
 // This class implements history::HistoryClient to abstract operations that
 // depend on Chrome environment.
 class ChromeHistoryClient : public history::HistoryClient,
-                            public history::HistoryServiceObserver,
-                            public history::TopSitesObserver {
+                            public history::TopSitesObserver,
+                            public HistoryService::Observer {
  public:
   explicit ChromeHistoryClient(BookmarkModel* bookmark_model,
                                Profile* profile,
                                history::TopSites* top_sites);
   virtual ~ChromeHistoryClient();
 
   // TODO(sdefresne): once NOTIFICATION_HISTORY_URL* notifications are no
   // longer used, remove this reference to the HistoryService from the
   // ChromeHistoryClient, http://crbug.com/42178
   void SetHistoryService(HistoryService* history_service);
 
   // history::HistoryClient:
   virtual void BlockUntilBookmarksLoaded() OVERRIDE;
   virtual bool IsBookmarked(const GURL& url) OVERRIDE;
   virtual void GetBookmarks(
       std::vector<history::URLAndTitle>* bookmarks) OVERRIDE;
   virtual void NotifyProfileError(sql::InitStatus init_status) OVERRIDE;
   virtual bool ShouldReportDatabaseError() OVERRIDE;
 
   // KeyedService:
   virtual void Shutdown() OVERRIDE;
 
-  // HistoryServiceObserver:
+  // HistoryService::Observer:
   virtual void OnURLVisited(ui::PageTransition transition,
                             const history::URLRow& row,
                             const history::RedirectList& redirects,
                             base::Time visit_time) OVERRIDE;
 
   // TopSitesObserver:
   virtual void TopSitesLoaded(history::TopSites* top_sites) OVERRIDE;
   virtual void TopSitesChanged(history::TopSites* top_sites) OVERRIDE;
 
  private:
@@ skipping 10 matching lines @@
   // called, and the Profile is fully constructed before any of the KeyedService
   // can  be constructed. The TopSites does not use the HistoryService nor the
   // HistoryClient during construction (it uses it later, but supports getting
   // an NULL  pointer).
   history::TopSites* top_sites_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeHistoryClient);
 };
 
 #endif  // CHROME_BROWSER_HISTORY_CHROME_HISTORY_CLIENT_H_