Chromium Code Reviews| Index: sync/internal_api/public/sync_manager.h |
| diff --git a/sync/internal_api/public/sync_manager.h b/sync/internal_api/public/sync_manager.h |
| index d31888c60b94cce003f7d0512d0125f39158b56b..54b43fa2af38fa5122a6ff2c3b5ceeb85a32a058 100644 |
| --- a/sync/internal_api/public/sync_manager.h |
| +++ b/sync/internal_api/public/sync_manager.h |
| @@ -20,6 +20,7 @@ |
| #include "sync/internal_api/public/configure_reason.h" |
| #include "sync/internal_api/public/engine/model_safe_worker.h" |
| #include "sync/internal_api/public/engine/sync_status.h" |
| +#include "sync/internal_api/public/internal_components_factory.h" |
|
Nicolas Zea
2012/07/18 21:10:12
forward declare?
tim (not reviewing)
2012/07/18 21:57:47
Done.
|
| #include "sync/internal_api/public/util/report_unrecoverable_error_function.h" |
| #include "sync/internal_api/public/util/unrecoverable_error_handler.h" |
|
Nicolas Zea
2012/07/18 21:10:12
this can be forward declared too I think
tim (not reviewing)
2012/07/18 21:57:47
Done.
|
| #include "sync/internal_api/public/util/weak_handle.h" |
| @@ -341,12 +342,6 @@ class SyncManager { |
| virtual ~Observer(); |
| }; |
| - enum TestingMode { |
| - NON_TEST, |
| - TEST_ON_DISK, |
| - TEST_IN_MEMORY, |
| - }; |
| - |
| // Create an uninitialized SyncManager. Callers must Init() before using. |
| explicit SyncManager(const std::string& name); |
| virtual ~SyncManager(); |
| @@ -388,7 +383,7 @@ class SyncManager { |
| const SyncCredentials& credentials, |
| syncer::SyncNotifier* sync_notifier, |
| const std::string& restored_key_for_bootstrapping, |
| - TestingMode testing_mode, |
| + scoped_ptr<InternalComponentsFactory> internal_components_factory, |
| syncer::Encryptor* encryptor, |
| syncer::UnrecoverableErrorHandler* |
| unrecoverable_error_handler, |