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

chrome/browser/history/history_querying_unittest.cc

Index: chrome/browser/history/history_querying_unittest.cc
diff --git a/chrome/browser/history/history_querying_unittest.cc b/chrome/browser/history/history_querying_unittest.cc
index da0a34bc9f4bb875285323efd28f5f0a8588f44d..dca1a832c594228fd34f3da4ceb2d5bbc5cef741 100644
--- a/chrome/browser/history/history_querying_unittest.cc
+++ b/chrome/browser/history/history_querying_unittest.cc
@@ -72,7 +72,7 @@ bool NthResultIs(const QueryResults& results,
 
 class HistoryQueryTest : public testing::Test {
  public:
-  HistoryQueryTest() : page_id_(0) {
+  HistoryQueryTest() : nav_entry_id_(0) {
   }
 
   // Acts like a synchronous call to history's QueryHistory.
@@ -145,14 +145,14 @@ class HistoryQueryTest : public testing::Test {
   scoped_ptr<HistoryService> history_;
 
   // Counter used to generate a unique ID for each page added to the history.
-  int32 page_id_;
+  int nav_entry_id_;
 
   void AddEntryToHistory(const TestEntry& entry) {
     // We need the ID scope and page ID so that the visit tracker can find it.
     ContextID context_id = reinterpret_cast<ContextID>(1);
     GURL url(entry.url);
 
-    history_->AddPage(url, entry.time, context_id, page_id_++, GURL(),
+    history_->AddPage(url, entry.time, context_id, nav_entry_id_++, GURL(),
                       history::RedirectList(), ui::PAGE_TRANSITION_LINK,
                       history::SOURCE_BROWSED, false);
     history_->SetPageTitle(url, base::UTF8ToUTF16(entry.title));