TTF: Re-enable coverage of ExpireHistoryTest.DeleteURLAndFavicon by marking it

flaky instead of disabled.  Add the corresponding bug to the comment.

BUG=43586
TEST=none

Review URL: http://codereview.chromium.org/1979004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46719 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 3 insertions, 3 deletions

diff --git a/chrome/browser/history/expire_history_backend_unittest.cc b/chrome/browser/history/expire_history_backend_unittest.cc
index 5cb6e1d..314b708 100644
--- a/chrome/browser/history/expire_history_backend_unittest.cc
+++ b/chrome/browser/history/expire_history_backend_unittest.cc
@@ -381,8 +381,8 @@ 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.
-// Temporarily disabling as fails near end of month.
-TEST_F(ExpireHistoryTest, DISABLED_DeleteURLAndFavicon) {
+// Marking as flaky because it fails near end of month. http://crbug.com/43586
+TEST_F(ExpireHistoryTest, FLAKY_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 cec9dea..fc23c13 100644
--- a/chrome/browser/history/text_database_manager.h
+++ b/chrome/browser/history/text_database_manager.h
@@ -158,7 +158,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, FLAKY_DeleteURLAndFavicon);
   FRIEND_TEST(ExpireHistoryTest, FlushRecentURLsUnstarred);
   FRIEND_TEST(ExpireHistoryTest, FlushRecentURLsUnstarredRestricted);