Revert 110450 - Re-enable stress sync integration tests

Reason for revert: Redness on the waterfall.

The stress sync integration tests use 10 sync clients, and were
originally flaky due to testserver bugginess.

Several fixes have gone in since then, and it might be time to re-enable
those tests.

Note to future Chromium Sheriffs: If these stress tests do fail or time out in future, feel free to revert this patch.

BUG=69604
TEST=sync_integration_tests --gtest_filter=ManyClient*


Review URL: http://codereview.chromium.org/8568033

TBR=rsimha@chromium.org
Review URL: http://codereview.chromium.org/8587038

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

3 files changed, 6 insertions, 3 deletions

diff --git a/chrome/browser/sync/test/integration/many_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/many_client_bookmarks_sync_test.cc
index fc65a52..27c6fb3 100644
--- a/chrome/browser/sync/test/integration/many_client_bookmarks_sync_test.cc
+++ b/chrome/browser/sync/test/integration/many_client_bookmarks_sync_test.cc
@@ -19,7 +19,8 @@ class ManyClientBookmarksSyncTest : public SyncTest {
   DISALLOW_COPY_AND_ASSIGN(ManyClientBookmarksSyncTest);
 };
 
-IN_PROC_BROWSER_TEST_F(ManyClientBookmarksSyncTest, Sanity) {
+// TODO(rsimha): Enable once http://crbug.com/69604 is fixed.
+IN_PROC_BROWSER_TEST_F(ManyClientBookmarksSyncTest, DISABLED_Sanity) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(AddURL(0, L"Google URL", GURL("http://www.google.com/")) != NULL);
   ASSERT_TRUE(GetClient(0)->AwaitGroupSyncCycleCompletion(clients()));
diff --git a/chrome/browser/sync/test/integration/many_client_passwords_sync_test.cc b/chrome/browser/sync/test/integration/many_client_passwords_sync_test.cc
index d9cabfd..e5519bc 100644
--- a/chrome/browser/sync/test/integration/many_client_passwords_sync_test.cc
+++ b/chrome/browser/sync/test/integration/many_client_passwords_sync_test.cc
@@ -27,7 +27,8 @@ class ManyClientPasswordsSyncTest : public SyncTest {
   DISALLOW_COPY_AND_ASSIGN(ManyClientPasswordsSyncTest);
 };
 
-IN_PROC_BROWSER_TEST_F(ManyClientPasswordsSyncTest, Sanity) {
+// TODO(rsimha): Enable once http://crbug.com/69604 is fixed.
+IN_PROC_BROWSER_TEST_F(ManyClientPasswordsSyncTest, DISABLED_Sanity) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   PasswordForm form = CreateTestPasswordForm(0);
diff --git a/chrome/browser/sync/test/integration/many_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/many_client_preferences_sync_test.cc
index ed30bcb..5301763 100644
--- a/chrome/browser/sync/test/integration/many_client_preferences_sync_test.cc
+++ b/chrome/browser/sync/test/integration/many_client_preferences_sync_test.cc
@@ -19,7 +19,8 @@ class ManyClientPreferencesSyncTest : public SyncTest {
   DISALLOW_COPY_AND_ASSIGN(ManyClientPreferencesSyncTest);
 };
 
-IN_PROC_BROWSER_TEST_F(ManyClientPreferencesSyncTest, Sanity) {
+// TODO(rsimha): Enable once http://crbug.com/69604 is fixed.
+IN_PROC_BROWSER_TEST_F(ManyClientPreferencesSyncTest, DISABLED_Sanity) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage));
   ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage);