Flakiness cleanup: disable flaky tests under chrome/browser/

Part 2 of what looks like it'll be 3 or 4.

See https://groups.google.com/a/chromium.org/group/chromium-dev/browse_thread/thread/fcec09fc659f39a6

BUG=89173,43586,88318,79074,76170,62772,69390,62311,88834,102030,62311,60071,113057,55915,53926,74554,47228,96459,85863,61619,102094,48833,61619,50648,22111

Review URL: https://chromiumcodereview.appspot.com/9348108

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

3 files changed, 6 insertions, 6 deletions

diff --git a/chrome/browser/history/expire_history_backend_unittest.cc b/chrome/browser/history/expire_history_backend_unittest.cc
index 52bd759..b61a2c0 100644
--- a/chrome/browser/history/expire_history_backend_unittest.cc
+++ b/chrome/browser/history/expire_history_backend_unittest.cc
@@ -439,7 +439,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, FLAKY_DeleteURLAndFavicon) {
+TEST_F(ExpireHistoryTest, DISABLED_DeleteURLAndFavicon) {
   URLID url_ids[3];
   Time visit_times[4];
   AddExampleData(url_ids, visit_times);
diff --git a/chrome/browser/history/history_extension_apitest.cc b/chrome/browser/history/history_extension_apitest.cc
index 129c9dc..09425e5 100644
--- a/chrome/browser/history/history_extension_apitest.cc
+++ b/chrome/browser/history/history_extension_apitest.cc
@@ -31,7 +31,7 @@ IN_PROC_BROWSER_TEST_F(HistoryExtensionApiTest, TimedSearch) {
 
 #if defined(OS_WIN)
 // Flakily times out on Win - See http://crbug.com/88318
-#define MAYBE_Delete FLAKY_Delete
+#define MAYBE_Delete DISABLED_Delete
 #else
 #define MAYBE_Delete Delete
 #endif
@@ -40,14 +40,14 @@ IN_PROC_BROWSER_TEST_F(HistoryExtensionApiTest, MAYBE_Delete) {
 }
 
 // See crbug.com/79074
-IN_PROC_BROWSER_TEST_F(HistoryExtensionApiTest, FLAKY_GetVisits) {
+IN_PROC_BROWSER_TEST_F(HistoryExtensionApiTest, DISABLED_GetVisits) {
   ASSERT_TRUE(RunExtensionSubtest("history", "get_visits.html")) << message_;
 }
 
 #if defined(OS_WIN)
 // Searching for a URL right after adding it fails on win XP.
 // Fix this as part of crbug/76170.
-#define MAYBE_SearchAfterAdd FLAKY_SearchAfterAdd
+#define MAYBE_SearchAfterAdd DISABLED_SearchAfterAdd
 #else
 #define MAYBE_SearchAfterAdd SearchAfterAdd
 #endif
diff --git a/chrome/browser/history/redirect_uitest.cc b/chrome/browser/history/redirect_uitest.cc
index a4f73c7..f351980 100644
--- a/chrome/browser/history/redirect_uitest.cc
+++ b/chrome/browser/history/redirect_uitest.cc
@@ -92,7 +92,7 @@ TEST_F(RedirectTest, Client) {
 }
 
 // http://code.google.com/p/chromium/issues/detail?id=62772
-TEST_F(RedirectTest, FLAKY_ClientEmptyReferer) {
+TEST_F(RedirectTest, DISABLED_ClientEmptyReferer) {
   ASSERT_TRUE(test_server_.Start());
 
   // Create the file contents, which will do a redirect to the
@@ -252,7 +252,7 @@ TEST_F(RedirectTest, ServerReference) {
 // B) does not take place.
 //
 // Flaky on XP and Vista, http://crbug.com/69390.
-TEST_F(RedirectTest, FLAKY_NoHttpToFile) {
+TEST_F(RedirectTest, DISABLED_NoHttpToFile) {
   ASSERT_TRUE(test_server_.Start());
   FilePath test_file(test_data_directory_);
   test_file = test_file.AppendASCII("http_to_file.html");