| Index: chrome/browser/sync_file_system/drive_backend/sync_engine.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc
|
| index a66d82b697a911fe2affcac124202bbf6e946414..190cf080ff42bd40618d9fd3449ad6c9242fbc7f 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc
|
| @@ -214,7 +214,7 @@ SyncEngine::~SyncEngine() {
|
| if (!worker_task_runner_->DeleteSoon(FROM_HERE, worker_observer))
|
| delete worker_observer;
|
|
|
| - SyncWorker* sync_worker = sync_worker_.release();
|
| + SyncWorkerInterface* sync_worker = sync_worker_.release();
|
| if (!worker_task_runner_->DeleteSoon(FROM_HERE, sync_worker)) {
|
| sync_worker->DetachFromSequence();
|
| delete sync_worker;
|
| @@ -251,15 +251,17 @@ void SyncEngine::Initialize(const base::FilePath& base_dir,
|
| if (extension_service_)
|
| extension_service_weak_ptr = extension_service_->AsWeakPtr();
|
|
|
| - sync_worker_.reset(new SyncWorker(
|
| + scoped_ptr<SyncWorker> worker(new SyncWorker(
|
| base_dir,
|
| extension_service_weak_ptr,
|
| sync_engine_context.Pass(),
|
| env_override));
|
| - sync_worker_->AddObserver(worker_observer_.get());
|
| + worker->AddObserver(worker_observer_.get());
|
| +
|
| + sync_worker_ = worker.PassAs<SyncWorkerInterface>();
|
| worker_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&SyncWorker::Initialize,
|
| + base::Bind(&SyncWorkerInterface::Initialize,
|
| base::Unretained(sync_worker_.get())));
|
|
|
| if (notification_manager_)
|
| @@ -284,7 +286,7 @@ void SyncEngine::RegisterOrigin(const GURL& origin,
|
|
|
| worker_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&SyncWorker::RegisterOrigin,
|
| + base::Bind(&SyncWorkerInterface::RegisterOrigin,
|
| base::Unretained(sync_worker_.get()),
|
| origin, relayed_callback));
|
| }
|
| @@ -296,7 +298,7 @@ void SyncEngine::EnableOrigin(
|
|
|
| worker_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&SyncWorker::EnableOrigin,
|
| + base::Bind(&SyncWorkerInterface::EnableOrigin,
|
| base::Unretained(sync_worker_.get()),
|
| origin, relayed_callback));
|
| }
|
| @@ -308,7 +310,7 @@ void SyncEngine::DisableOrigin(
|
|
|
| worker_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&SyncWorker::DisableOrigin,
|
| + base::Bind(&SyncWorkerInterface::DisableOrigin,
|
| base::Unretained(sync_worker_.get()),
|
| origin,
|
| relayed_callback));
|
| @@ -322,7 +324,7 @@ void SyncEngine::UninstallOrigin(
|
| FROM_HERE, TrackCallback(callback));
|
| worker_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&SyncWorker::UninstallOrigin,
|
| + base::Bind(&SyncWorkerInterface::UninstallOrigin,
|
| base::Unretained(sync_worker_.get()),
|
| origin, flag, relayed_callback));
|
| }
|
| @@ -335,7 +337,7 @@ void SyncEngine::ProcessRemoteChange(const SyncFileCallback& callback) {
|
| FROM_HERE, tracked_callback);
|
| worker_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&SyncWorker::ProcessRemoteChange,
|
| + base::Bind(&SyncWorkerInterface::ProcessRemoteChange,
|
| base::Unretained(sync_worker_.get()),
|
| relayed_callback));
|
| }
|
| @@ -352,7 +354,7 @@ void SyncEngine::SetRemoteChangeProcessor(RemoteChangeProcessor* processor) {
|
|
|
| worker_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&SyncWorker::SetRemoteChangeProcessor,
|
| + base::Bind(&SyncWorkerInterface::SetRemoteChangeProcessor,
|
| base::Unretained(sync_worker_.get()),
|
| remote_change_processor_on_worker_.get()));
|
| }
|
| @@ -376,7 +378,7 @@ void SyncEngine::GetOriginStatusMap(const StatusMapCallback& callback) {
|
|
|
| worker_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&SyncWorker::GetOriginStatusMap,
|
| + base::Bind(&SyncWorkerInterface::GetOriginStatusMap,
|
| base::Unretained(sync_worker_.get()),
|
| relayed_callback));
|
| }
|
| @@ -391,7 +393,7 @@ void SyncEngine::DumpFiles(const GURL& origin,
|
| PostTaskAndReplyWithResult(
|
| worker_task_runner_,
|
| FROM_HERE,
|
| - base::Bind(&SyncWorker::DumpFiles,
|
| + base::Bind(&SyncWorkerInterface::DumpFiles,
|
| base::Unretained(sync_worker_.get()),
|
| origin),
|
| tracked_callback);
|
| @@ -406,7 +408,7 @@ void SyncEngine::DumpDatabase(const ListCallback& callback) {
|
| PostTaskAndReplyWithResult(
|
| worker_task_runner_,
|
| FROM_HERE,
|
| - base::Bind(&SyncWorker::DumpDatabase,
|
| + base::Bind(&SyncWorkerInterface::DumpDatabase,
|
| base::Unretained(sync_worker_.get())),
|
| tracked_callback);
|
| }
|
| @@ -414,7 +416,7 @@ void SyncEngine::DumpDatabase(const ListCallback& callback) {
|
| void SyncEngine::SetSyncEnabled(bool enabled) {
|
| worker_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&SyncWorker::SetSyncEnabled,
|
| + base::Bind(&SyncWorkerInterface::SetSyncEnabled,
|
| base::Unretained(sync_worker_.get()),
|
| enabled));
|
| }
|
| @@ -422,7 +424,7 @@ void SyncEngine::SetSyncEnabled(bool enabled) {
|
| void SyncEngine::PromoteDemotedChanges() {
|
| worker_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&SyncWorker::PromoteDemotedChanges,
|
| + base::Bind(&SyncWorkerInterface::PromoteDemotedChanges,
|
| base::Unretained(sync_worker_.get())));
|
| }
|
|
|
| @@ -436,7 +438,7 @@ void SyncEngine::ApplyLocalChange(
|
| FROM_HERE, TrackCallback(callback));
|
| worker_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&SyncWorker::ApplyLocalChange,
|
| + base::Bind(&SyncWorkerInterface::ApplyLocalChange,
|
| base::Unretained(sync_worker_.get()),
|
| local_change,
|
| local_path,
|
| @@ -448,7 +450,7 @@ void SyncEngine::ApplyLocalChange(
|
| void SyncEngine::OnNotificationReceived() {
|
| worker_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&SyncWorker::OnNotificationReceived,
|
| + base::Bind(&SyncWorkerInterface::OnNotificationReceived,
|
| base::Unretained(sync_worker_.get())));
|
| }
|
|
|
| @@ -462,7 +464,7 @@ void SyncEngine::OnReadyToSendRequests() {
|
|
|
| worker_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&SyncWorker::OnReadyToSendRequests,
|
| + base::Bind(&SyncWorkerInterface::OnReadyToSendRequests,
|
| base::Unretained(sync_worker_.get()),
|
| account_id));
|
| }
|
| @@ -470,7 +472,7 @@ void SyncEngine::OnReadyToSendRequests() {
|
| void SyncEngine::OnRefreshTokenInvalid() {
|
| worker_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&SyncWorker::OnRefreshTokenInvalid,
|
| + base::Bind(&SyncWorkerInterface::OnRefreshTokenInvalid,
|
| base::Unretained(sync_worker_.get())));
|
| }
|
|
|
| @@ -478,7 +480,7 @@ void SyncEngine::OnNetworkChanged(
|
| net::NetworkChangeNotifier::ConnectionType type) {
|
| worker_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&SyncWorker::OnNetworkChanged,
|
| + base::Bind(&SyncWorkerInterface::OnNetworkChanged,
|
| base::Unretained(sync_worker_.get()),
|
| type));
|
| }
|
|
|