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 be3a51a18477c1f3ae973dd9d3b7ed15d643fffe..fecf2c3a6079e45257519fe50f6d9c236f5ae7ab 100644 |
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc |
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc |
@@ -134,7 +134,8 @@ void DidRegisterOrigin(const base::TimeTicks& start_time, |
} // namespace |
scoped_ptr<SyncEngine> SyncEngine::CreateForBrowserContext( |
- content::BrowserContext* context) { |
+ content::BrowserContext* context, |
+ TaskLogger* task_logger) { |
scoped_refptr<base::SequencedWorkerPool> worker_pool( |
content::BrowserThread::GetBlockingPool()); |
scoped_refptr<base::SequencedTaskRunner> drive_task_runner( |
@@ -184,6 +185,7 @@ scoped_ptr<SyncEngine> SyncEngine::CreateForBrowserContext( |
extension_service, |
signin_manager)); |
sync_engine->Initialize(GetSyncFileSystemDir(context->GetPath()), |
+ task_logger, |
file_task_runner.get(), |
NULL); |
@@ -209,27 +211,26 @@ SyncEngine::~SyncEngine() { |
} |
void SyncEngine::Initialize(const base::FilePath& base_dir, |
+ TaskLogger* task_logger, |
base::SequencedTaskRunner* file_task_runner, |
leveldb::Env* env_override) { |
// DriveServiceWrapper and DriveServiceOnWorker relay communications |
// between DriveService and syncers in SyncWorker. |
- scoped_ptr<drive::DriveServiceInterface> |
- drive_service_on_worker( |
- new DriveServiceOnWorker(drive_service_wrapper_->AsWeakPtr(), |
- base::MessageLoopProxy::current(), |
- worker_task_runner_)); |
- scoped_ptr<drive::DriveUploaderInterface> |
- drive_uploader_on_worker( |
- new DriveUploaderOnWorker(drive_uploader_wrapper_->AsWeakPtr(), |
- base::MessageLoopProxy::current(), |
- worker_task_runner_)); |
- scoped_ptr<SyncEngineContext> |
- sync_engine_context( |
- new SyncEngineContext(drive_service_on_worker.Pass(), |
- drive_uploader_on_worker.Pass(), |
+ scoped_ptr<drive::DriveServiceInterface> drive_service_on_worker( |
+ new DriveServiceOnWorker(drive_service_wrapper_->AsWeakPtr(), |
+ base::MessageLoopProxy::current(), |
+ worker_task_runner_)); |
+ scoped_ptr<drive::DriveUploaderInterface> drive_uploader_on_worker( |
+ new DriveUploaderOnWorker(drive_uploader_wrapper_->AsWeakPtr(), |
base::MessageLoopProxy::current(), |
- worker_task_runner_, |
- file_task_runner)); |
+ worker_task_runner_)); |
+ scoped_ptr<SyncEngineContext> sync_engine_context( |
+ new SyncEngineContext(drive_service_on_worker.Pass(), |
+ drive_uploader_on_worker.Pass(), |
+ task_logger, |
+ base::MessageLoopProxy::current(), |
+ worker_task_runner_, |
+ file_task_runner)); |
worker_observer_.reset( |
new WorkerObserver(base::MessageLoopProxy::current(), |