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

chrome/test/data/webui/history_ui_browsertest.cc

Index: chrome/test/data/webui/history_ui_browsertest.cc
diff --git a/chrome/test/data/webui/history_ui_browsertest.cc b/chrome/test/data/webui/history_ui_browsertest.cc
index 947733880f87549f7b692c98ab3233d44843b4ae..7fe7038fddc080d5dc465010e5b2622f558d7ea4 100644
--- a/chrome/test/data/webui/history_ui_browsertest.cc
+++ b/chrome/test/data/webui/history_ui_browsertest.cc
@@ -16,7 +16,7 @@
 HistoryUIBrowserTest::HistoryUIBrowserTest()
     : history_(NULL),
       baseline_time_(base::Time::Now().LocalMidnight()),
-      page_id_(0) {
+      nav_entry_id_(0) {
 }
 
 HistoryUIBrowserTest::~HistoryUIBrowserTest() {
@@ -37,7 +37,7 @@ void HistoryUIBrowserTest::AddPageToHistory(
 
   base::Time time = baseline_time_ + base::TimeDelta::FromHours(hour_offset);
   GURL gurl = GURL(url);
-  history_->AddPage(gurl, time, id_scope, page_id_++, GURL(),
+  history_->AddPage(gurl, time, id_scope, nav_entry_id_++, GURL(),
                     history::RedirectList(), ui::PAGE_TRANSITION_LINK,
                     history::SOURCE_BROWSED, false);
   history_->SetPageTitle(gurl, base::UTF8ToUTF16(title));