sync: add InternalComponentsFactory::Switches to simplify passing switches to internal components.

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 <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 152 matching lines @@
   }
 
   if (username_.empty() || password_.empty())
     LOG(FATAL) << "Cannot run sync tests without GAIA credentials.";
 
   // Mock the Mac Keychain service.  The real Keychain can block on user input.
 #if defined(OS_MACOSX)
   Encryptor::UseMockKeychain(true);
 #endif
 
-  // TODO(tim): Use command line flag.
-  syncer::SyncSchedulerImpl::ForceShortInitialBackoffRetry();
-
   // Yield control back to the InProcessBrowserTest framework.
   InProcessBrowserTest::SetUp();
 }
 
 void SyncTest::TearDown() {
   // Allow the InProcessBrowserTest framework to perform its tear down.
   InProcessBrowserTest::TearDown();
 
   // Stop the local python test server. This is a no-op if one wasn't started.
   TearDownLocalPythonTestServer();
@@ skipping 13 matching lines @@
   if (!cl->HasSwitch(switches::kSyncNotificationMethod))
     cl->AppendSwitchASCII(switches::kSyncNotificationMethod, "p2p");
 
   // Disable non-essential access of external network resources.
   if (!cl->HasSwitch(switches::kDisableBackgroundNetworking))
     cl->AppendSwitch(switches::kDisableBackgroundNetworking);
 
   // TODO(sync): remove this once keystore encryption is enabled by default.
   if (!cl->HasSwitch(switches::kSyncKeystoreEncryption))
     cl->AppendSwitch(switches::kSyncKeystoreEncryption);
+
+  if (!cl->HasSwitch(switches::kSyncShortInitialRetryOverride))
+    cl->AppendSwitch(switches::kSyncShortInitialRetryOverride);
 }
 
 void SyncTest::AddOptionalTypesToCommandLine(CommandLine* cl) {}
 
 // static
 Profile* SyncTest::MakeProfile(const FilePath::StringType name) {
   FilePath path;
   PathService::Get(chrome::DIR_USER_DATA, &path);
   path = path.Append(name);
 
@@ skipping 576 matching lines @@
 
 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter,
                               const net::ProxyConfig& proxy_config) {
   base::WaitableEvent done(false, false);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&SetProxyConfigCallback, &done,
                  make_scoped_refptr(context_getter), proxy_config));
   done.Wait();
 }