Index: sync/internal_api/sync_rollback_manager.cc |
diff --git a/sync/internal_api/sync_rollback_manager.cc b/sync/internal_api/sync_rollback_manager.cc |
index a26e54ec38a0db2907cd726a73b0d6e637a518f1..b4100c76136f7a83e03e6423ba23d6d5790e34b2 100644 |
--- a/sync/internal_api/sync_rollback_manager.cc |
+++ b/sync/internal_api/sync_rollback_manager.cc |
@@ -22,34 +22,18 @@ SyncRollbackManager::SyncRollbackManager() |
SyncRollbackManager::~SyncRollbackManager() { |
} |
-void SyncRollbackManager::Init( |
- const base::FilePath& database_location, |
- const WeakHandle<JsEventHandler>& event_handler, |
- const GURL& service_url, |
- scoped_ptr<HttpPostProviderFactory> post_factory, |
- const std::vector<scoped_refptr<ModelSafeWorker> >& workers, |
- ExtensionsActivity* extensions_activity, |
- SyncManager::ChangeDelegate* change_delegate, |
- const SyncCredentials& credentials, |
- const std::string& invalidator_client_id, |
- const std::string& restored_key_for_bootstrapping, |
- const std::string& restored_keystore_key_for_bootstrapping, |
- InternalComponentsFactory* internal_components_factory, |
- Encryptor* encryptor, |
- scoped_ptr<UnrecoverableErrorHandler> unrecoverable_error_handler, |
- ReportUnrecoverableErrorFunction report_unrecoverable_error_function, |
- CancelationSignal* cancelation_signal) { |
+void SyncRollbackManager::Init(InitArgs* args) { |
if (SyncRollbackManagerBase::InitInternal( |
- database_location, |
- internal_components_factory, |
- unrecoverable_error_handler.Pass(), |
- report_unrecoverable_error_function)) { |
- change_delegate_ = change_delegate; |
- |
- for (size_t i = 0; i < workers.size(); ++i) { |
- ModelSafeGroup group = workers[i]->GetModelSafeGroup(); |
+ args->database_location, |
+ args->internal_components_factory.get(), |
+ args->unrecoverable_error_handler.Pass(), |
+ args->report_unrecoverable_error_function)) { |
+ change_delegate_ = args->change_delegate; |
+ |
+ for (size_t i = 0; i < args->workers.size(); ++i) { |
+ ModelSafeGroup group = args->workers[i]->GetModelSafeGroup(); |
CHECK(workers_.find(group) == workers_.end()); |
- workers_[group] = workers[i]; |
+ workers_[group] = args->workers[i]; |
} |
rollback_ready_types_ = GetUserShare()->directory->InitialSyncEndedTypes(); |