diff options
| author | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-27 03:27:46 +0000 |
|---|---|---|
| committer | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-27 03:27:46 +0000 |
| commit | 90ef1313cb672e7da91312c4f7d3cdee41c7a767 (patch) | |
| tree | b42df35c8c71ca921bf7900beb537a1773debacf /chrome/browser/autocomplete | |
| parent | 7459794d5e6251014e322a4042d68c4f3f19a5f3 (diff) | |
| download | chromium_src-90ef1313cb672e7da91312c4f7d3cdee41c7a767.zip chromium_src-90ef1313cb672e7da91312c4f7d3cdee41c7a767.tar.gz chromium_src-90ef1313cb672e7da91312c4f7d3cdee41c7a767.tar.bz2 | |
Makes deleting history no longer delete starred urls. Thiseffectively reenables the code in ExpireHistoryBackend. I also madethe code consistent so that when we delete visits as the result ofhistory deletion we don't change the typed/visit count of theunderlying url.BUG=1214201 1256202TEST=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1423 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
| -rw-r--r-- | chrome/browser/autocomplete/history_contents_provider_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/autocomplete/history_url_provider_unittest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/autocomplete/history_contents_provider_unittest.cc b/chrome/browser/autocomplete/history_contents_provider_unittest.cc index ba7985a..2e1a646 100644 --- a/chrome/browser/autocomplete/history_contents_provider_unittest.cc +++ b/chrome/browser/autocomplete/history_contents_provider_unittest.cc @@ -54,7 +54,7 @@ class HistoryContentsProviderTest : public testing::Test, file_util::CreateDirectoryW(history_dir_); history_service_ = new HistoryService; - history_service_->Init(history_dir_); + history_service_->Init(history_dir_, NULL); // Populate history. for (int i = 0; i < arraysize(test_entries); i++) { diff --git a/chrome/browser/autocomplete/history_url_provider_unittest.cc b/chrome/browser/autocomplete/history_url_provider_unittest.cc index 05a696d..6dd80e9 100644 --- a/chrome/browser/autocomplete/history_url_provider_unittest.cc +++ b/chrome/browser/autocomplete/history_url_provider_unittest.cc @@ -114,7 +114,7 @@ void HistoryURLProviderTest::OnProviderUpdate(bool updated_matches) { void HistoryURLProviderTest::SetUp() { profile_.reset(new TestingProfile()); - profile_->CreateBookmarkBarModel(); + profile_->CreateBookmarkBarModel(true); profile_->CreateHistoryService(true); history_service_ = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS); |