Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(248)

Unified Diff: sync/internal_api/sync_rollback_manager.cc

Issue 451743002: Pass args to SyncManager::Init via a struct. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use scoped_ptr instead of raw pointer. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/internal_api/sync_rollback_manager.h ('k') | sync/internal_api/sync_rollback_manager_base_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « sync/internal_api/sync_rollback_manager.h ('k') | sync/internal_api/sync_rollback_manager_base_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698