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

components/history/core/browser/visit_tracker_unittest.cc

 // Copyright (c) 2006-2008 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.
 
 #include "components/history/core/browser/visit_tracker.h"
 
 #include "base/basictypes.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using history::ContextID;
 using history::VisitTracker;
 
 namespace {
 
 struct VisitToTest {
   // Identifies the context.
   int context_id_int;
-  int32 page_id;
+  int nav_entry_id;
 
   // Used when adding this to the tracker
   const char* url;
   const history::VisitID visit_id;
 
   // Used when finding the referrer
   const char* referrer;
 
   // the correct referring visit ID to compare to the computed one
   history::VisitID referring_visit_id;
 };
 
 void RunTest(VisitTracker* tracker, VisitToTest* test, int test_count) {
   for (int i = 0; i < test_count; i++) {
     // Our host pointer is actually just an int, convert it (it will not get
     // dereferenced).
     ContextID context_id = reinterpret_cast<ContextID>(test[i].context_id_int);
 
     // Check the referrer for this visit.
     history::VisitID ref_visit = tracker->GetLastVisit(
-        context_id, test[i].page_id, GURL(test[i].referrer));
+        context_id, test[i].nav_entry_id, GURL(test[i].referrer));
     EXPECT_EQ(test[i].referring_visit_id, ref_visit);
 
     // Now add this visit.
     tracker->AddVisit(
-        context_id, test[i].page_id, GURL(test[i].url), test[i].visit_id);
+        context_id, test[i].nav_entry_id, GURL(test[i].url), test[i].visit_id);
   }
 }
 
 }  // namespace
 
 // A simple test that makes sure we transition between main pages in the
 // presence of back/forward.
 TEST(VisitTracker, SimpleTransitions) {
   VisitToTest test_simple[] = {
       // Started here:
@@ skipping 66 matching lines @@
   // Say that context has been invalidated.
   tracker.ClearCachedDataForContextID(reinterpret_cast<ContextID>(1));
 
   // Simple navigation from a new process with the same ID, it should not find
   // a referrer.
   VisitToTest part2[] = {
       {1, 1, "http://images.google.com/", 2, "http://www.google.com/", 0},
   };
   RunTest(&tracker, part2, arraysize(part2));
 }