Rename VisitDatabaseObserver to HistoryServiceObserver

chrome/browser/prerender/prerender_local_predictor.h

 // Copyright (c) 2012 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_PRERENDER_PRERENDER_LOCAL_PREDICTOR_H_
 #define CHROME_BROWSER_PRERENDER_PRERENDER_LOCAL_PREDICTOR_H_
 
 #include <map>
 #include <vector>
 
 #include "base/containers/hash_tables.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/history/visit_database.h"
+#include "components/history/core/browser/history_service_observer.h"
 #include "content/public/browser/session_storage_namespace.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "url/gurl.h"
 
 class HistoryService;
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace content {
 class WebContents;
 }
 
 namespace gfx {
 class Size;
 }
 
 namespace prerender {
 
 class PrerenderHandle;
 class PrerenderManager;
 
 // PrerenderLocalPredictor maintains local browsing history to make prerender
 // predictions.
 // At this point, the class is not actually creating prerenders, but just
 // recording timing stats about the effect prerendering would have.
-class PrerenderLocalPredictor : public history::VisitDatabaseObserver,
+class PrerenderLocalPredictor : public history::HistoryServiceObserver,
                                 public net::URLFetcherDelegate {
  public:
   struct LocalPredictorURLInfo;
   struct CandidatePrerenderInfo;
   // A class simulating a set of URLs prefetched, for statistical purposes.
   class PrefetchList;
   enum Event {
     EVENT_CONSTRUCTED = 0,
     EVENT_INIT_SCHEDULED = 1,
     EVENT_INIT_STARTED = 2,
@@ skipping 94 matching lines @@
   };
 
   // A PrerenderLocalPredictor is owned by the PrerenderManager specified
   // in the constructor.  It will be destoryed at the time its owning
   // PrerenderManager is destroyed.
   explicit PrerenderLocalPredictor(PrerenderManager* prerender_manager);
   virtual ~PrerenderLocalPredictor();
 
   void Shutdown();
 
-  // history::VisitDatabaseObserver implementation
-  virtual void OnAddVisit(const history::BriefVisitInfo& info) override;
+  // history::HistoryServiceObserver:
+  virtual void OnAddVisit(HistoryService* history_service,
+                          const history::BriefVisitInfo& info) override;
 
   void OnGetInitialVisitHistory(
       scoped_ptr<std::vector<history::BriefVisitInfo> > visit_history);
 
   void OnPLTEventForURL(const GURL& url, base::TimeDelta page_load_time);
 
   void OnTabHelperURLSeen(const GURL& url, content::WebContents* web_contents);
 
   // net::URLFetcherDelegate implementation:
   void virtual OnURLFetchComplete(const net::URLFetcher* source) override;
@@ skipping 41 matching lines @@
       OutstandingFetchers;
   OutstandingFetchers outstanding_prerender_service_requests_;
   PrerenderManager* prerender_manager_;
   base::OneShotTimer<PrerenderLocalPredictor> timer_;
 
   // Delay after which to initialize, to avoid putting to much load on the
   // database thread early on when Chrome is starting up.
   static const int kInitDelayMs = 5 * 1000;
 
   // Whether we're registered with the history service as a
-  // history::VisitDatabaseObserver.
-  bool is_visit_database_observer_;
+  // history::HistoryServiceObserver.
+  bool is_history_service_observer_;
 
   base::CancelableTaskTracker history_db_tracker_;
 
   scoped_ptr<std::vector<history::BriefVisitInfo> > visit_history_;
 
   scoped_ptr<PrerenderProperties> current_prerender_;
   scoped_ptr<PrerenderProperties> last_swapped_in_prerender_;
 
   ScopedVector<PrerenderProperties> issued_prerenders_;
 
   base::hash_set<int64> url_whitelist_;
 
   scoped_ptr<PrefetchList> prefetch_list_;
 
   base::WeakPtrFactory<PrerenderLocalPredictor> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PrerenderLocalPredictor);
 };
 
 }  // namespace prerender
 
 #endif  // CHROME_BROWSER_PRERENDER_PRERENDER_LOCAL_PREDICTOR_H_