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

chrome/browser/history/history_querying_unittest.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 "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 54 matching lines @@
   // Now check the URL & title.
   return result.url() == GURL(test_entries[test_entry_index].url) &&
          result.title() ==
              base::UTF8ToUTF16(test_entries[test_entry_index].title);
 }
 
 }  // namespace
 
 class HistoryQueryTest : public testing::Test {
  public:
-  HistoryQueryTest() : page_id_(0) {
+  HistoryQueryTest() : nav_entry_id_(0) {
   }
 
   // Acts like a synchronous call to history's QueryHistory.
   void QueryHistory(const std::string& text_query,
                     const QueryOptions& options,
                     QueryResults* results) {
     history_->QueryHistory(base::UTF8ToUTF16(text_query),
                            options,
                            base::Bind(&HistoryQueryTest::QueryHistoryComplete,
                                       base::Unretained(this)),
@@ skipping 52 matching lines @@
       QueryHistory(query_text, options, &results);
       ASSERT_NE(options.end_time, results.back().visit_time());
       options.end_time = results.back().visit_time();
     } while (!results.reached_beginning());
   }
 
  protected:
   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));
   }
 
  private:
   void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     history_dir_ = temp_dir_.path().AppendASCII("HistoryTest");
     ASSERT_TRUE(base::CreateDirectory(history_dir_));
@@ skipping 255 matching lines @@
 
 TEST_F(HistoryQueryTest, TextSearchPaging) {
   // Since results are fetched 1 and 2 at a time, entry #0 and #6 will not
   // be de-duplicated. Entry #4 does not contain the text "title", so it
   // shouldn't appear.
   int expected_results[] = { 2, 3, 1, 7, 6, 5 };
   TestPaging("title", expected_results, arraysize(expected_results));
 }
 
 }  // namespace history