summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/history/expire_history_backend_unittest.cc2
-rw-r--r--chrome/browser/history/text_database_manager.h2
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