summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync
diff options
context:
space:
mode:
authornsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-29 15:26:53 +0000
committernsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-29 15:26:53 +0000
commita5f44c93e83cb964fa4c0529d6333f50ee5e73cf (patch)
tree9169eb8ff52307c491e0ee64dd86c1e4281fb888 /chrome/browser/sync
parentaf8c5a0b17ff0a06df021ba028f1ac385fae5e56 (diff)
downloadchromium_src-a5f44c93e83cb964fa4c0529d6333f50ee5e73cf.zip
chromium_src-a5f44c93e83cb964fa4c0529d6333f50ee5e73cf.tar.gz
chromium_src-a5f44c93e83cb964fa4c0529d6333f50ee5e73cf.tar.bz2
Disable it for real this time.
Review URL: http://codereview.chromium.org/245043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27478 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
-rw-r--r--chrome/browser/sync/engine/syncer_thread_unittest.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/sync/engine/syncer_thread_unittest.cc b/chrome/browser/sync/engine/syncer_thread_unittest.cc
index 729ee14..ce6b9cc 100644
--- a/chrome/browser/sync/engine/syncer_thread_unittest.cc
+++ b/chrome/browser/sync/engine/syncer_thread_unittest.cc
@@ -365,7 +365,8 @@ TEST_F(SyncerThreadTest, CalculatePollingWaitTime) {
}
// This test is disabled. see bug 23336.
-TEST_F(SyncerThreadWithSyncerTest, DISABLED_Polling) {
+#if 0
+TEST_F(SyncerThreadWithSyncerTest, Polling) {
SyncShareIntercept interceptor;
connection()->SetMidCommitObserver(&interceptor);
@@ -404,6 +405,7 @@ TEST_F(SyncerThreadWithSyncerTest, DISABLED_Polling) {
EXPECT_TRUE(data[i + 1] < optimal_next_sync + poll_interval);
}
}
+#endif
TEST_F(SyncerThreadWithSyncerTest, Nudge) {
SyncShareIntercept interceptor;