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

chrome/browser/history/history_tab_helper.cc

 // 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.
 
 #include "chrome/browser/history/history_tab_helper.h"
 
 #include <utility>
 
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
@@ skipping 38 matching lines @@
   if (hs)
     hs->SetPageTitle(entry.GetVirtualURL(),
                      entry.GetTitleForDisplay(std::string()));
 }
 
 history::HistoryAddPageArgs
 HistoryTabHelper::CreateHistoryAddPageArgs(
     const GURL& virtual_url,
     base::Time timestamp,
     bool did_replace_entry,
+    int nav_entry_id,
     const content::FrameNavigateParams& params) {
   history::HistoryAddPageArgs add_page_args(
-      params.url, timestamp, web_contents(), params.page_id,
+      params.url, timestamp, web_contents(), nav_entry_id,
       params.referrer.url, params.redirects, params.transition,
       history::SOURCE_BROWSED, did_replace_entry);
   if (ui::PageTransitionIsMainFrame(params.transition) &&
       virtual_url != params.url) {
     // Hack on the "virtual" URL so that it will appear in history. For some
     // types of URLs, we will display a magic URL that is different from where
     // the page is actually navigated. We want the user to see in history what
     // they saw in the URL bar, so we add the virtual URL as a redirect.  This
     // only applies to the main frame, as the virtual URL doesn't apply to
     // sub-frames.
@@ skipping 17 matching lines @@
     const content::FrameNavigateParams& params) {
   // Update history. Note that this needs to happen after the entry is complete,
   // which WillNavigate[Main,Sub]Frame will do before this function is called.
   if (!params.should_update_history)
     return;
 
   // Most of the time, the displayURL matches the loaded URL, but for about:
   // URLs, we use a data: URL as the real value.  We actually want to save the
   // about: URL to the history db and keep the data: URL hidden. This is what
   // the WebContents' URL getter does.
+  NavigationEntry* last_committed =
+      web_contents()->GetController().GetLastCommittedEntry();
   const history::HistoryAddPageArgs& add_page_args =
       CreateHistoryAddPageArgs(
           web_contents()->GetURL(), details.entry->GetTimestamp(),
-          details.did_replace_entry, params);
+          details.did_replace_entry, last_committed->GetUniqueID(), params);
 
   prerender::PrerenderManager* prerender_manager =
       prerender::PrerenderManagerFactory::GetForProfile(
           Profile::FromBrowserContext(web_contents()->GetBrowserContext()));
   if (prerender_manager) {
     prerender::PrerenderContents* prerender_contents =
         prerender_manager->GetPrerenderContents(web_contents());
     if (prerender_contents) {
       prerender_contents->DidNavigate(add_page_args);
       return;
@@ skipping 35 matching lines @@
   WebContents* tab = web_contents();
   Profile* profile = Profile::FromBrowserContext(tab->GetBrowserContext());
   if (profile->IsOffTheRecord())
     return;
 
   HistoryService* hs =
       HistoryServiceFactory::GetForProfile(profile, Profile::IMPLICIT_ACCESS);
   if (hs) {
     NavigationEntry* entry = tab->GetController().GetLastCommittedEntry();
     if (entry) {
-      hs->UpdateWithPageEndTime(tab, entry->GetPageID(), tab->GetURL(),
+      hs->UpdateWithPageEndTime(tab, entry->GetUniqueID(), tab->GetURL(),
                                 base::Time::Now());
     }
     hs->ClearCachedDataForContextID(tab);
   }
 }