Revert of [sync] "TwoClientBookmarksSyncTest.Sanity" is flaky

chrome/browser/sync/test/integration/sync_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/test/integration/sync_test.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
@@ skipping 289 matching lines @@
 #endif
 }
 
 void SyncTest::AddTestSwitches(base::CommandLine* cl) {
   // Disable non-essential access of external network resources.
   if (!cl->HasSwitch(switches::kDisableBackgroundNetworking))
     cl->AppendSwitch(switches::kDisableBackgroundNetworking);
 
   if (!cl->HasSwitch(switches::kSyncShortInitialRetryOverride))
     cl->AppendSwitch(switches::kSyncShortInitialRetryOverride);
-
-  if (!cl->HasSwitch(switches::kSyncShortNudgeDelayForTest))
-    cl->AppendSwitch(switches::kSyncShortNudgeDelayForTest);
 }
 
 void SyncTest::AddOptionalTypesToCommandLine(base::CommandLine* cl) {}
 
 bool SyncTest::CreateGaiaAccount(const std::string& username,
                                  const std::string& password) {
   std::string relative_url = base::StringPrintf("/CreateUsers?%s=%s",
                                                 username.c_str(),
                                                 password.c_str());
   GURL create_user_url =
@@ skipping 806 matching lines @@
 
 void SyncTest::TriggerSyncForModelTypes(int index,
                                         syncer::ModelTypeSet model_types) {
   GetSyncService(index)->TriggerRefresh(model_types);
 }
 
 void SyncTest::SetPreexistingPreferencesFileContents(
     const std::string& contents) {
   preexisting_preferences_file_contents_ = contents;
 }