summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/sync/engine/syncer_thread_unittest.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/sync/engine/syncer_thread_unittest.cc b/chrome/browser/sync/engine/syncer_thread_unittest.cc
index a5fcc8f..abc31a5 100644
--- a/chrome/browser/sync/engine/syncer_thread_unittest.cc
+++ b/chrome/browser/sync/engine/syncer_thread_unittest.cc
@@ -697,7 +697,10 @@ TEST_F(SyncerThreadWithSyncerTest, Nudge) {
EXPECT_TRUE(syncer_thread()->Stop(2000));
}
-TEST_F(SyncerThreadWithSyncerTest, NudgeWithDataTypes) {
+
+
+// Flaky, see http://crbug.com/62880.
+TEST_F(SyncerThreadWithSyncerTest, FLAKY_NudgeWithDataTypes) {
SyncShareIntercept interceptor;
connection()->SetMidCommitObserver(&interceptor);
// We don't want a poll to happen during this test (except the first one).