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

components/history/core/browser/history_types.h

Index: components/history/core/browser/history_types.h
diff --git a/components/history/core/browser/history_types.h b/components/history/core/browser/history_types.h
index a5c8fe5c05948d97db9c622913c41da3d5cf6f83..6dcc3804c95abeffbed90a9be1fe0bd60d866fd4 100644
--- a/components/history/core/browser/history_types.h
+++ b/components/history/core/browser/history_types.h
@@ -44,8 +44,9 @@ typedef int64 FaviconBitmapID; // Identifier for a bitmap in a favicon.
 typedef int64 SegmentID;  // URL segments for the most visited view.
 typedef int64 IconMappingID; // For page url and icon mapping.
 
-// Identifier for a context to scope page ids. (ContextIDs are used in
-// comparisons only and are never dereferenced.)
+// Identifier for a context to scope the lifetime of navigation entry
+// references. (ContextIDs are used in comparisons only and are never
+// dereferenced.)
 // NB: The use of WebContents here is temporary; when the dependency on content
 // is broken, some other type will take its place.
 typedef content::WebContents* ContextID;
@@ -372,14 +373,20 @@ struct HistoryAddPageArgs {
   // The default constructor is equivalent to:
   //
   //   HistoryAddPageArgs(
-  //       GURL(), base::Time(), NULL, 0, GURL(),
-  //       history::RedirectList(), ui::PAGE_TRANSITION_LINK,
-  //       SOURCE_BROWSED, false)
+  //       GURL(),  /* url */

[sdefresne, 2014/12/29 09:59:39]

nit: I don't think this reformatting improves readability. The name and type of
the parameter can be easily seen from the second constructor that is defined on
the next line.

[Avi (use Gerrit), 2014/12/29 18:43:21]

Done.

+  //       base::Time(),  /* time */
+  //       nullptr,  /* context_id */
+  //       0,  /* nav_entry_id */
+  //       GURL(),  /* referrer */
+  //       history::RedirectList(),  /* redirects */
+  //       ui::PAGE_TRANSITION_LINK,  /* transition */
+  //       SOURCE_BROWSED,  /* source */
+  //       false)  /* did_replace_entry */
   HistoryAddPageArgs();
   HistoryAddPageArgs(const GURL& url,
                      base::Time time,
                      ContextID context_id,
-                     int32 page_id,
+                     int nav_entry_id,
                      const GURL& referrer,
                      const history::RedirectList& redirects,
                      ui::PageTransition transition,
@@ -389,10 +396,8 @@ struct HistoryAddPageArgs {
 
   GURL url;
   base::Time time;
-
   ContextID context_id;
-  int32 page_id;
-
+  int nav_entry_id;
   GURL referrer;
   history::RedirectList redirects;
   ui::PageTransition transition;