summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-25 19:56:20 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-25 19:56:20 +0000
commit33fe494bc6ed180bf11124e71b5c0b5438fa596b (patch)
tree7ba62d7de8fcd859bddc18c06408a573b484d77c /base
parent0090fbecdfa366bb24563d1aa06c20ea0a383c8d (diff)
downloadchromium_src-33fe494bc6ed180bf11124e71b5c0b5438fa596b.zip
chromium_src-33fe494bc6ed180bf11124e71b5c0b5438fa596b.tar.gz
chromium_src-33fe494bc6ed180bf11124e71b5c0b5438fa596b.tar.bz2
TTF: Re-enable StatsTableTest.MultipleThreads by marking it flaky.
TBR=stuartmorgan BUG=10611 TEST=StatsTableTest.MultipleThreads git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48180 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/stats_table_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/base/stats_table_unittest.cc b/base/stats_table_unittest.cc
index f8fda0b..5c8e499 100644
--- a/base/stats_table_unittest.cc
+++ b/base/stats_table_unittest.cc
@@ -108,8 +108,8 @@ void StatsTableThread::Run() {
}
// Create a few threads and have them poke on their counters.
-// Disabled, http://crbug.com/10611.
-TEST_F(StatsTableTest, DISABLED_MultipleThreads) {
+// Flaky, http://crbug.com/10611.
+TEST_F(StatsTableTest, FLAKY_MultipleThreads) {
// Create a stats table.
const std::string kTableName = "MultipleThreadStatTable";
const int kMaxThreads = 20;