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

chrome/browser/history/history_service.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_HISTORY_HISTORY_SERVICE_H_
 #define CHROME_BROWSER_HISTORY_HISTORY_SERVICE_H_
 
 #include <set>
 #include <vector>
 
@@ skipping 145 matching lines @@
   // Navigation ----------------------------------------------------------------
 
   // Adds the given canonical URL to history with the given time as the visit
   // time. Referrer may be the empty string.
   //
   // The supplied context id is used to scope the given page ID. Page IDs
   // are only unique inside a given context, so we need that to differentiate
   // them.
   //
   // The context/page ids can be NULL if there is no meaningful tracking
-  // information that can be performed on the given URL. The 'page_id' should
-  // be the ID of the current session history entry in the given process.
+  // information that can be performed on the given URL. The 'nav_entry_id'
+  // should be the unique ID of the current navigation entry in the given
+  // process.
   //
   // 'redirects' is an array of redirect URLs leading to this page, with the
   // page itself as the last item (so when there is no redirect, it will have
   // one entry). If there are no redirects, this array may also be empty for
   // the convenience of callers.
   //
   // 'did_replace_entry' is true when the navigation entry for this page has
   // replaced the existing entry. A non-user initiated redirect causes such
   // replacement.
   //
   // All "Add Page" functions will update the visited link database.
   void AddPage(const GURL& url,
                base::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);
 
   // For adding pages to history where no tracking information can be done.
   void AddPage(const GURL& url,
                base::Time time,
                history::VisitSource visit_source);
 
   // All AddPage variants end up here.
   void AddPage(const history::HistoryAddPageArgs& add_page_args);
 
   // Adds an entry for the specified url without creating a visit. This should
   // only be used when bookmarking a page, otherwise the row leaks in the
   // history db (it never gets cleaned).
   void AddPageNoVisitForBookmark(const GURL& url, const base::string16& title);
 
   // Sets the title for the given page. The page should be in history. If it
   // is not, this operation is ignored.
   void SetPageTitle(const GURL& url, const base::string16& title);
 
   // Updates the history database with a page's ending time stamp information.
-  // The page can be identified by the combination of the context id, the page
-  // id and the url.
+  // The page can be identified by the combination of the context id, the
+  // navigation entry id and the url.
   void UpdateWithPageEndTime(history::ContextID context_id,
-                             int32 page_id,
+                             int nav_entry_id,
                              const GURL& url,
                              base::Time end_ts);
 
   // Querying ------------------------------------------------------------------
 
   // Returns the information about the requested URL. If the URL is found,
   // success will be true and the information will be in the URLRow parameter.
   // On success, the visits, if requested, will be sorted by date. If they have
   // not been requested, the pointer will be valid, but the vector will be
   // empty.
@@ skipping 684 matching lines @@
 
   history::DeleteDirectiveHandler delete_directive_handler_;
 
   // All vended weak pointers are invalidated in Cleanup().
   base::WeakPtrFactory<HistoryService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryService);
 };
 
 #endif  // CHROME_BROWSER_HISTORY_HISTORY_SERVICE_H_