| Index: chrome/browser/history/history_service.cc
|
| diff --git a/chrome/browser/history/history_service.cc b/chrome/browser/history/history_service.cc
|
| index ea860614bae271488bf4f517ea544ee2d3b9f20d..bd795bef549f677a53710e33480056538c1eeb98 100644
|
| --- a/chrome/browser/history/history_service.cc
|
| +++ b/chrome/browser/history/history_service.cc
|
| @@ -392,7 +392,7 @@ void HistoryService::SetOnBackendDestroyTask(const base::Closure& task) {
|
| void HistoryService::AddPage(const GURL& url,
|
| Time time,
|
| history::ContextID context_id,
|
| - int32 page_id,
|
| + int nav_entry_id,
|
| const GURL& referrer,
|
| const history::RedirectList& redirects,
|
| ui::PageTransition transition,
|
| @@ -400,7 +400,7 @@ void HistoryService::AddPage(const GURL& url,
|
| bool did_replace_entry) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| AddPage(
|
| - history::HistoryAddPageArgs(url, time, context_id, page_id, referrer,
|
| + history::HistoryAddPageArgs(url, time, context_id, nav_entry_id, referrer,
|
| redirects, transition, visit_source,
|
| did_replace_entry));
|
| }
|
| @@ -465,13 +465,13 @@ void HistoryService::SetPageTitle(const GURL& url,
|
| }
|
|
|
| void HistoryService::UpdateWithPageEndTime(history::ContextID context_id,
|
| - int32 page_id,
|
| + int nav_entry_id,
|
| const GURL& url,
|
| Time end_ts) {
|
| DCHECK(thread_) << "History service being called after cleanup";
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| ScheduleAndForget(PRIORITY_NORMAL, &HistoryBackend::UpdateWithPageEndTime,
|
| - context_id, page_id, url, end_ts);
|
| + context_id, nav_entry_id, url, end_ts);
|
| }
|
|
|
| void HistoryService::AddPageWithDetails(const GURL& url,
|
|
|