summaryrefslogtreecommitdiffstats
path: root/chrome/browser/history
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/history')
-rw-r--r--chrome/browser/history/expire_history_backend_unittest.cc4
-rw-r--r--chrome/browser/history/snippet_unittest.cc2
-rw-r--r--chrome/browser/history/text_database_manager.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/history/expire_history_backend_unittest.cc b/chrome/browser/history/expire_history_backend_unittest.cc
index 314b708..4752806 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.
-// Marking as flaky because it fails near end of month. http://crbug.com/43586
-TEST_F(ExpireHistoryTest, FLAKY_DeleteURLAndFavicon) {
+// Fails near end of month. http://crbug.com/43586
+TEST_F(ExpireHistoryTest, FAILS_DeleteURLAndFavicon) {
URLID url_ids[3];
Time visit_times[4];
AddExampleData(url_ids, visit_times);
diff --git a/chrome/browser/history/snippet_unittest.cc b/chrome/browser/history/snippet_unittest.cc
index d8629a1..517e2c0 100644
--- a/chrome/browser/history/snippet_unittest.cc
+++ b/chrome/browser/history/snippet_unittest.cc
@@ -166,7 +166,7 @@ TEST(Snippets, UTF8) {
// TODO(jungshik): Move this bug report to crbugs.com
// Fails consistently. From the report, "Broken by latest ICU. Need new expected
// results."
-TEST(Snippets, FLAKY_ThaiUTF8) {
+TEST(Snippets, FAILS_ThaiUTF8) {
// There are 3 instances of '\u0E43\u0E2B\u0E49'
// (\xE0\xB9\x83\xE0\xB8\xAB\xE0\xB9\x89) in kThaiSample.
// The 1st is more than |kSniipetContext| graphemes away from the
diff --git a/chrome/browser/history/text_database_manager.h b/chrome/browser/history/text_database_manager.h
index fc23c13..e043f20 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, FLAKY_DeleteURLAndFavicon);
+ FRIEND_TEST(ExpireHistoryTest, FAILS_DeleteURLAndFavicon);
FRIEND_TEST(ExpireHistoryTest, FlushRecentURLsUnstarred);
FRIEND_TEST(ExpireHistoryTest, FlushRecentURLsUnstarredRestricted);