diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 22:19:18 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 22:19:18 +0000 |
| commit | 6d2dc98e938a0ff4da17e78e96ae6261bece64ef (patch) | |
| tree | 9127eb2b563f30bbc4a7b3d38969ba0768289f85 /sync/tools | |
| parent | 0b9db6796ae57fe8bb36b2e89528efa51f8e938b (diff) | |
| download | chromium_src-6d2dc98e938a0ff4da17e78e96ae6261bece64ef.zip chromium_src-6d2dc98e938a0ff4da17e78e96ae6261bece64ef.tar.gz chromium_src-6d2dc98e938a0ff4da17e78e96ae6261bece64ef.tar.bz2 | |
sync: Remove SyncManager::TestingMode in favour of InternalComponentsFactory.
Turns SyncScheduler into an interface and adds a FakeSyncScheduler class for tests.
BUG=117836
TEST=
Review URL: https://chromiumcodereview.appspot.com/10701046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147553 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/tools')
| -rw-r--r-- | sync/tools/sync_client.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc index 1b9dbf8..ce2aabd 100644 --- a/sync/tools/sync_client.cc +++ b/sync/tools/sync_client.cc @@ -30,6 +30,7 @@ #include "sync/internal_api/public/base_node.h" #include "sync/internal_api/public/engine/passive_model_worker.h" #include "sync/internal_api/public/http_bridge.h" +#include "sync/internal_api/public/internal_components_factory_impl.h" #include "sync/internal_api/public/read_node.h" #include "sync/internal_api/public/sync_manager.h" #include "sync/internal_api/public/sync_manager_factory.h" @@ -347,8 +348,6 @@ int main(int argc, char* argv[]) { syncer::ExtensionsActivityMonitor* extensions_activity_monitor = NULL; LoggingChangeDelegate change_delegate; const char kRestoredKeyForBootstrapping[] = ""; - const syncer::SyncManager::TestingMode kTestingMode = - syncer::SyncManager::NON_TEST; NullEncryptor null_encryptor; LoggingUnrecoverableErrorHandler unrecoverable_error_handler; sync_manager->Init(database_dir.path(), @@ -367,7 +366,8 @@ int main(int argc, char* argv[]) { scoped_ptr<syncer::SyncNotifier>( sync_notifier_factory.CreateSyncNotifier()), kRestoredKeyForBootstrapping, - kTestingMode, + scoped_ptr<syncer::InternalComponentsFactory>( + new syncer::InternalComponentsFactoryImpl()), &null_encryptor, &unrecoverable_error_handler, &LogUnrecoverableErrorContext); |