Switch the history backend from using page ids to navigation entry unique ids.

chrome/browser/history/history_service.cc

 // 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.
 
 // The history system runs on a background thread so that potentially slow
 // database operations don't delay the browser. This backend processing is
 // represented by HistoryBackend. The HistoryService's job is to dispatch to
 // that thread.
 //
 // Main thread                       History thread
@@ skipping 374 matching lines @@
 void HistoryService::SetOnBackendDestroyTask(const base::Closure& task) {
   DCHECK(thread_) << "History service being called after cleanup";
   DCHECK(thread_checker_.CalledOnValidThread());
   ScheduleAndForget(PRIORITY_NORMAL, &HistoryBackend::SetOnBackendDestroyTask,
                     base::MessageLoop::current(), task);
 }
 
 void HistoryService::AddPage(const GURL& url,
                              Time time,
                              history::ContextID context_id,
-                             int32 page_id,
+                             int nav_entry_id,
                              const GURL& referrer,
                              const history::RedirectList& redirects,
                              ui::PageTransition transition,
                              history::VisitSource visit_source,
                              bool did_replace_entry) {
   DCHECK(thread_checker_.CalledOnValidThread());
   AddPage(
-      history::HistoryAddPageArgs(url, time, context_id, page_id, referrer,
+      history::HistoryAddPageArgs(url, time, context_id, nav_entry_id, referrer,
                                   redirects, transition, visit_source,
                                   did_replace_entry));
 }
 
 void HistoryService::AddPage(const GURL& url,
                              base::Time time,
                              history::VisitSource visit_source) {
   DCHECK(thread_checker_.CalledOnValidThread());
   AddPage(
       history::HistoryAddPageArgs(url, time, NULL, 0, GURL(),
@@ skipping 44 matching lines @@
 }
 
 void HistoryService::SetPageTitle(const GURL& url,
                                   const base::string16& title) {
   DCHECK(thread_) << "History service being called after cleanup";
   DCHECK(thread_checker_.CalledOnValidThread());
   ScheduleAndForget(PRIORITY_NORMAL, &HistoryBackend::SetPageTitle, url, title);
 }
 
 void HistoryService::UpdateWithPageEndTime(history::ContextID context_id,
-                                           int32 page_id,
+                                           int nav_entry_id,
                                            const GURL& url,
                                            Time end_ts) {
   DCHECK(thread_) << "History service being called after cleanup";
   DCHECK(thread_checker_.CalledOnValidThread());
   ScheduleAndForget(PRIORITY_NORMAL, &HistoryBackend::UpdateWithPageEndTime,
-                    context_id, page_id, url, end_ts);
+                    context_id, nav_entry_id, url, end_ts);
 }
 
 void HistoryService::AddPageWithDetails(const GURL& url,
                                         const base::string16& title,
                                         int visit_count,
                                         int typed_count,
                                         Time last_visit,
                                         bool hidden,
                                         history::VisitSource visit_source) {
   DCHECK(thread_) << "History service being called after cleanup";
@@ skipping 800 matching lines @@
     const HistoryService::OnFaviconChangedCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   return favicon_changed_callback_list_.Add(callback);
 }
 
 void HistoryService::NotifyFaviconChanged(
     const std::set<GURL>& changed_favicons) {
   DCHECK(thread_checker_.CalledOnValidThread());
   favicon_changed_callback_list_.Notify(changed_favicons);
 }