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

Unified Diff: components/browser_sync/profile_sync_service.cc

Issue 2489433002: [Sync] Move thread checking into the ModelSafeWorker interface. (Closed)
Patch Set: Improve/add comments. Created 4 years, 1 month 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
Index: components/browser_sync/profile_sync_service.cc
diff --git a/components/browser_sync/profile_sync_service.cc b/components/browser_sync/profile_sync_service.cc
index bf06a348d3d3ac774b08da706d4153df1d8744dc..ad29ab5986023d10f4049b4f74b2b92a14e14930 100644
--- a/components/browser_sync/profile_sync_service.cc
+++ b/components/browser_sync/profile_sync_service.cc
@@ -184,8 +184,6 @@ ProfileSyncService::InitParams::InitParams(InitParams&& other) // NOLINT
url_request_context(std::move(other.url_request_context)),
debug_identifier(std::move(other.debug_identifier)),
channel(other.channel),
- db_thread(std::move(other.db_thread)),
- file_thread(std::move(other.file_thread)),
blocking_pool(other.blocking_pool) {}
ProfileSyncService::ProfileSyncService(InitParams init_params)
@@ -203,8 +201,6 @@ ProfileSyncService::ProfileSyncService(InitParams init_params)
url_request_context_(init_params.url_request_context),
debug_identifier_(std::move(init_params.debug_identifier)),
channel_(init_params.channel),
- db_thread_(init_params.db_thread),
- file_thread_(init_params.file_thread),
blocking_pool_(init_params.blocking_pool),
is_first_time_sync_configure_(false),
backend_initialized_(false),
@@ -545,9 +541,9 @@ void ProfileSyncService::InitializeBackend(bool delete_stale_data) {
url_request_context_, network_time_update_callback_);
backend_->Initialize(
- this, sync_thread_.get(), db_thread_, file_thread_, GetJsEventHandler(),
- sync_service_url_, local_device_->GetSyncUserAgent(), credentials,
- delete_stale_data, enable_local_sync_backend, local_sync_backend_folder,
+ this, sync_thread_.get(), GetJsEventHandler(), sync_service_url_,
+ local_device_->GetSyncUserAgent(), credentials, delete_stale_data,
+ enable_local_sync_backend, local_sync_backend_folder,
base::MakeUnique<syncer::SyncManagerFactory>(),
MakeWeakHandle(sync_enabled_weak_factory_.GetWeakPtr()),
base::Bind(syncer::ReportUnrecoverableError, channel_),

Powered by Google App Engine
This is Rietveld 408576698