| Index: chrome/browser/history/history_backend_unittest.cc
|
| diff --git a/chrome/browser/history/history_backend_unittest.cc b/chrome/browser/history/history_backend_unittest.cc
|
| index faf15f4c898d2177c8679257beecab850574fe4c..917b8dfe35d11817006795b1f6445180c7edf8f4 100644
|
| --- a/chrome/browser/history/history_backend_unittest.cc
|
| +++ b/chrome/browser/history/history_backend_unittest.cc
|
| @@ -503,12 +503,10 @@ TEST_F(HistoryBackendTest, DeleteAll) {
|
| VisitVector visits;
|
| backend_->db_->GetVisitsForURL(row1_id, &visits);
|
| ASSERT_EQ(1U, visits.size());
|
| - VisitID visit1_id = visits[0].visit_id;
|
|
|
| visits.clear();
|
| backend_->db_->GetVisitsForURL(row2_id, &visits);
|
| ASSERT_EQ(1U, visits.size());
|
| - VisitID visit2_id = visits[0].visit_id;
|
|
|
| // The in-memory backend should have been set and it should have gotten the
|
| // typed URL.
|
| @@ -538,16 +536,6 @@ TEST_F(HistoryBackendTest, DeleteAll) {
|
| bookmark_model_.AddURL(
|
| bookmark_model_.bookmark_bar_node(), 0, string16(), row1.url());
|
|
|
| - // Set full text index for each one.
|
| - backend_->text_database_->AddPageData(row1.url(), row1_id, visit1_id,
|
| - row1.last_visit(),
|
| - UTF8ToUTF16("Title 1"),
|
| - UTF8ToUTF16("Body 1"));
|
| - backend_->text_database_->AddPageData(row2.url(), row2_id, visit2_id,
|
| - row2.last_visit(),
|
| - UTF8ToUTF16("Title 2"),
|
| - UTF8ToUTF16("Body 2"));
|
| -
|
| // Now finally clear all history.
|
| backend_->DeleteAllHistory();
|
|
|
| @@ -614,15 +602,6 @@ TEST_F(HistoryBackendTest, DeleteAll) {
|
|
|
| // The first URL should still be bookmarked.
|
| EXPECT_TRUE(bookmark_model_.IsBookmarked(row1.url()));
|
| -
|
| - // The full text database should have no data.
|
| - std::vector<TextDatabase::Match> text_matches;
|
| - Time first_time_searched;
|
| - backend_->text_database_->GetTextMatches(UTF8ToUTF16("Body"),
|
| - QueryOptions(),
|
| - &text_matches,
|
| - &first_time_searched);
|
| - EXPECT_EQ(0U, text_matches.size());
|
| }
|
|
|
| // Checks that adding a visit, then calling DeleteAll, and then trying to add
|
| @@ -658,9 +637,8 @@ TEST_F(HistoryBackendTest, DeleteAllThenAddData) {
|
| backend_->db_->GetAllVisitsInRange(Time(), Time(), 0, &all_visits);
|
| ASSERT_EQ(0U, all_visits.size());
|
|
|
| - // Try and set the full text index.
|
| + // Try and set the title.
|
| backend_->SetPageTitle(url, UTF8ToUTF16("Title"));
|
| - backend_->SetPageContents(url, UTF8ToUTF16("Body"));
|
|
|
| // The row should still be deleted.
|
| EXPECT_FALSE(backend_->db_->GetRowForURL(url, &outrow));
|
| @@ -668,15 +646,6 @@ TEST_F(HistoryBackendTest, DeleteAllThenAddData) {
|
| // The visit should still be deleted.
|
| backend_->db_->GetAllVisitsInRange(Time(), Time(), 0, &all_visits);
|
| ASSERT_EQ(0U, all_visits.size());
|
| -
|
| - // The full text database should have no data.
|
| - std::vector<TextDatabase::Match> text_matches;
|
| - Time first_time_searched;
|
| - backend_->text_database_->GetTextMatches(UTF8ToUTF16("Body"),
|
| - QueryOptions(),
|
| - &text_matches,
|
| - &first_time_searched);
|
| - EXPECT_EQ(0U, text_matches.size());
|
| }
|
|
|
| TEST_F(HistoryBackendTest, URLsNoLongerBookmarked) {
|
|
|