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

sync/tools/sync_client.cc

Index: sync/tools/sync_client.cc
diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc
index f671edc10dbd29dafc493c3f0e7d3221584a4d00..5f6de2a32f156929429409bc36f8b1dcb9ddb2e4 100644
--- a/sync/tools/sync_client.cc
+++ b/sync/tools/sync_client.cc
@@ -351,6 +351,11 @@ int SyncClientMain(int argc, char* argv[]) {
   const char kRestoredKeystoreKeyForBootstrapping[] = "";
   NullEncryptor null_encryptor;
   LoggingUnrecoverableErrorHandler unrecoverable_error_handler;
+  InternalComponentsFactoryImpl::Switches factory_switches = {
+      InternalComponentsFactory::ENCRYPTION_KEYSTORE,
+      InternalComponentsFactory::BACKOFF_NORMAL
+  };
+
   sync_manager->Init(database_dir.path(),
                     WeakHandle<JsEventHandler>(
                         js_event_handler.AsWeakPtr()),
@@ -367,9 +372,8 @@ int SyncClientMain(int argc, char* argv[]) {
                         sync_notifier_factory.CreateSyncNotifier()),
                     kRestoredKeyForBootstrapping,
                     kRestoredKeystoreKeyForBootstrapping,
-                    true,  // enable keystore encryption
                     scoped_ptr<InternalComponentsFactory>(
-                        new InternalComponentsFactoryImpl()),
+                        new InternalComponentsFactoryImpl(factory_switches)),
                     &null_encryptor,
                     &unrecoverable_error_handler,
                     &LogUnrecoverableErrorContext);