summaryrefslogtreecommitdiffstats
path: root/chrome/browser/history
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-13 06:13:02 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-13 06:13:02 +0000
commit1964d12e176788db130c82ca2e312e04dc97a6fa (patch)
tree2f6f567ace2cbf194b6bb2efc137b1dd839f1c6b /chrome/browser/history
parent3b02de2903ca82833712f6ab7840a4e16524c70b (diff)
downloadchromium_src-1964d12e176788db130c82ca2e312e04dc97a6fa.zip
chromium_src-1964d12e176788db130c82ca2e312e04dc97a6fa.tar.gz
chromium_src-1964d12e176788db130c82ca2e312e04dc97a6fa.tar.bz2
Flip ExpireHistoryTest.DeleteURLAndFavicon from FAILS back to FLAKY
per James Hawkins' request from http://codereview.chromium.org/2055014/show The problem is that this test does not appear on the flakiness dashboard, but hopefully the new flakiness bot will help with that. TEST=none BUG=none Review URL: http://codereview.chromium.org/2012012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47123 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history')
-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 4752806..10563ea 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.
// Fails near end of month. http://crbug.com/43586
-TEST_F(ExpireHistoryTest, FAILS_DeleteURLAndFavicon) {
+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 e043f20..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, FAILS_DeleteURLAndFavicon);
+ FRIEND_TEST(ExpireHistoryTest, FLAKY_DeleteURLAndFavicon);
FRIEND_TEST(ExpireHistoryTest, FlushRecentURLsUnstarred);
FRIEND_TEST(ExpireHistoryTest, FlushRecentURLsUnstarredRestricted);