diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-03 01:31:55 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-03 01:31:55 +0000 |
| commit | b6a6cd102bb4859707c12a09fbf1e35b1e5e0af2 (patch) | |
| tree | f7cf234e637bab46d1e3cdd0fb261753096950df /chrome/browser/history | |
| parent | 601bb6cf913baa54fa337028b1233f8a1cc47158 (diff) | |
| download | chromium_src-b6a6cd102bb4859707c12a09fbf1e35b1e5e0af2.zip chromium_src-b6a6cd102bb4859707c12a09fbf1e35b1e5e0af2.tar.gz chromium_src-b6a6cd102bb4859707c12a09fbf1e35b1e5e0af2.tar.bz2 | |
Reenable DeleteURLAndFavicon test.
This test was disabled because it started failing, however it's
passing on the tryservers now so we'll give it another chance.
BUG=9600
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17460 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history')
| -rw-r--r-- | chrome/browser/history/expire_history_backend_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/history/text_database_manager.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/history/expire_history_backend_unittest.cc b/chrome/browser/history/expire_history_backend_unittest.cc index 56df4f2..cc03695 100644 --- a/chrome/browser/history/expire_history_backend_unittest.cc +++ b/chrome/browser/history/expire_history_backend_unittest.cc @@ -382,7 +382,7 @@ bool ExpireHistoryTest::IsStringInFile(const FilePath& filename, // Deletes a URL with a favicon that it is the last referencer of, so that it // should also get deleted. -TEST_F(ExpireHistoryTest, DISABLED_DeleteURLAndFavicon) { +TEST_F(ExpireHistoryTest, DeleteURLAndFavicon) { URLID url_ids[3]; Time visit_times[4]; AddExampleData(url_ids, visit_times); diff --git a/chrome/browser/history/text_database_manager.h b/chrome/browser/history/text_database_manager.h index 9898abe..ee96687 100644 --- a/chrome/browser/history/text_database_manager.h +++ b/chrome/browser/history/text_database_manager.h @@ -159,7 +159,7 @@ class TextDatabaseManager { // These tests call ExpireRecentChangesForTime to force expiration. FRIEND_TEST(TextDatabaseManagerTest, InsertPartial); FRIEND_TEST(TextDatabaseManagerTest, PartialComplete); - FRIEND_TEST(ExpireHistoryTest, DISABLED_DeleteURLAndFavicon); + FRIEND_TEST(ExpireHistoryTest, DeleteURLAndFavicon); FRIEND_TEST(ExpireHistoryTest, FlushRecentURLsUnstarred); // Stores "recent stuff" that has happened with the page, since the page |