Commit 3b9b534f authored by dcheng's avatar dcheng Committed by Commit bot

Remove implicit conversions from scoped_refptr to T* in chrome/browser/sync_file_system/

This patch was generated by running the rewrite_scoped_refptr clang tool
on a Linux build.

BUG=110610

Review URL: https://codereview.chromium.org/506793002

Cr-Commit-Position: refs/heads/master@{#292097}
parent 25d7709b
...@@ -48,7 +48,7 @@ class CallbackHolder { ...@@ -48,7 +48,7 @@ class CallbackHolder {
: task_runner_(task_runner), : task_runner_(task_runner),
from_here_(from_here), from_here_(from_here),
callback_(new base::Callback<T>(callback)) { callback_(new base::Callback<T>(callback)) {
DCHECK(task_runner_); DCHECK(task_runner_.get());
} }
~CallbackHolder() { ~CallbackHolder() {
...@@ -57,7 +57,7 @@ class CallbackHolder { ...@@ -57,7 +57,7 @@ class CallbackHolder {
delete callback; delete callback;
} }
base::SequencedTaskRunner* task_runner() const { return task_runner_; } base::SequencedTaskRunner* task_runner() const { return task_runner_.get(); }
const tracked_objects::Location& from_here() const { return from_here_; } const tracked_objects::Location& from_here() const { return from_here_; }
const base::Callback<T>& callback() const { return *callback_; } const base::Callback<T>& callback() const { return *callback_; }
......
...@@ -75,14 +75,13 @@ TEST(DriveBackendCallbackHelperTest, RunOnOtherThreadTest) { ...@@ -75,14 +75,13 @@ TEST(DriveBackendCallbackHelperTest, RunOnOtherThreadTest) {
worker_task_runner->PostTask( worker_task_runner->PostTask(
FROM_HERE, FROM_HERE,
RelayCallbackToTaskRunner( RelayCallbackToTaskRunner(
ui_task_runner, FROM_HERE, ui_task_runner.get(),
base::Bind(&VerifyCalledOnTaskRunner, FROM_HERE,
ui_task_runner, &called))); base::Bind(&VerifyCalledOnTaskRunner, ui_task_runner, &called)));
worker_task_runner->PostTask( worker_task_runner->PostTask(
FROM_HERE, FROM_HERE,
RelayCallbackToTaskRunner( RelayCallbackToTaskRunner(
ui_task_runner, FROM_HERE, ui_task_runner.get(), FROM_HERE, run_loop.QuitClosure()));
run_loop.QuitClosure()));
run_loop.Run(); run_loop.Run();
EXPECT_TRUE(called); EXPECT_TRUE(called);
......
...@@ -112,19 +112,19 @@ class DriveBackendSyncTest : public testing::Test, ...@@ -112,19 +112,19 @@ class DriveBackendSyncTest : public testing::Test,
drive_service.get(), uploader.get(), drive_service.get(), uploader.get(),
kSyncRootFolderTitle)); kSyncRootFolderTitle));
remote_sync_service_.reset(new SyncEngine( remote_sync_service_.reset(
base::ThreadTaskRunnerHandle::Get(), // ui_task_runner new SyncEngine(base::ThreadTaskRunnerHandle::Get(), // ui_task_runner
worker_task_runner_, worker_task_runner_.get(),
drive_task_runner, drive_task_runner.get(),
base_dir_.path(), base_dir_.path(),
NULL, // task_logger NULL, // task_logger
NULL, // notification_manager NULL, // notification_manager
NULL, // extension_service NULL, // extension_service
NULL, // signin_manager NULL, // signin_manager
NULL, // token_service NULL, // token_service
NULL, // request_context NULL, // request_context
scoped_ptr<SyncEngine::DriveServiceFactory>(), scoped_ptr<SyncEngine::DriveServiceFactory>(),
in_memory_env_.get())); in_memory_env_.get()));
remote_sync_service_->AddServiceObserver(this); remote_sync_service_->AddServiceObserver(this);
remote_sync_service_->InitializeForTesting( remote_sync_service_->InitializeForTesting(
drive_service.PassAs<drive::DriveServiceInterface>(), drive_service.PassAs<drive::DriveServiceInterface>(),
...@@ -182,15 +182,14 @@ class DriveBackendSyncTest : public testing::Test, ...@@ -182,15 +182,14 @@ class DriveBackendSyncTest : public testing::Test,
bool success = false; bool success = false;
FileTracker tracker; FileTracker tracker;
PostTaskAndReplyWithResult( PostTaskAndReplyWithResult(
worker_task_runner_, worker_task_runner_.get(),
FROM_HERE, FROM_HERE,
base::Bind(&MetadataDatabase::FindAppRootTracker, base::Bind(&MetadataDatabase::FindAppRootTracker,
base::Unretained(metadata_database()), base::Unretained(metadata_database()),
app_id, app_id,
&tracker), &tracker),
base::Bind(&SetValueAndCallClosure<bool>, base::Bind(
run_loop.QuitClosure(), &SetValueAndCallClosure<bool>, run_loop.QuitClosure(), &success));
&success));
run_loop.Run(); run_loop.Run();
if (!success) if (!success)
return false; return false;
...@@ -211,7 +210,7 @@ class DriveBackendSyncTest : public testing::Test, ...@@ -211,7 +210,7 @@ class DriveBackendSyncTest : public testing::Test,
base::FilePath result_path; base::FilePath result_path;
base::FilePath normalized_path = path.NormalizePathSeparators(); base::FilePath normalized_path = path.NormalizePathSeparators();
PostTaskAndReplyWithResult( PostTaskAndReplyWithResult(
worker_task_runner_, worker_task_runner_.get(),
FROM_HERE, FROM_HERE,
base::Bind(&MetadataDatabase::FindNearestActiveAncestor, base::Bind(&MetadataDatabase::FindNearestActiveAncestor,
base::Unretained(metadata_database()), base::Unretained(metadata_database()),
...@@ -219,9 +218,8 @@ class DriveBackendSyncTest : public testing::Test, ...@@ -219,9 +218,8 @@ class DriveBackendSyncTest : public testing::Test,
normalized_path, normalized_path,
&tracker, &tracker,
&result_path), &result_path),
base::Bind(&SetValueAndCallClosure<bool>, base::Bind(
run_loop.QuitClosure(), &SetValueAndCallClosure<bool>, run_loop.QuitClosure(), &success));
&success));
run_loop.Run(); run_loop.Run();
EXPECT_TRUE(success); EXPECT_TRUE(success);
EXPECT_EQ(normalized_path, result_path); EXPECT_EQ(normalized_path, result_path);
...@@ -379,7 +377,7 @@ class DriveBackendSyncTest : public testing::Test, ...@@ -379,7 +377,7 @@ class DriveBackendSyncTest : public testing::Test,
base::RunLoop run_loop; base::RunLoop run_loop;
int64 largest_fetched_change_id = -1; int64 largest_fetched_change_id = -1;
PostTaskAndReplyWithResult( PostTaskAndReplyWithResult(
worker_task_runner_, worker_task_runner_.get(),
FROM_HERE, FROM_HERE,
base::Bind(&MetadataDatabase::GetLargestFetchedChangeID, base::Bind(&MetadataDatabase::GetLargestFetchedChangeID,
base::Unretained(metadata_database())), base::Unretained(metadata_database())),
...@@ -565,13 +563,12 @@ class DriveBackendSyncTest : public testing::Test, ...@@ -565,13 +563,12 @@ class DriveBackendSyncTest : public testing::Test,
size_t count = 0; size_t count = 0;
base::RunLoop run_loop; base::RunLoop run_loop;
PostTaskAndReplyWithResult( PostTaskAndReplyWithResult(
worker_task_runner_, worker_task_runner_.get(),
FROM_HERE, FROM_HERE,
base::Bind(&MetadataDatabase::CountFileMetadata, base::Bind(&MetadataDatabase::CountFileMetadata,
base::Unretained(metadata_database())), base::Unretained(metadata_database())),
base::Bind(&SetValueAndCallClosure<size_t>, base::Bind(
run_loop.QuitClosure(), &SetValueAndCallClosure<size_t>, run_loop.QuitClosure(), &count));
&count));
run_loop.Run(); run_loop.Run();
return count; return count;
} }
...@@ -580,12 +577,12 @@ class DriveBackendSyncTest : public testing::Test, ...@@ -580,12 +577,12 @@ class DriveBackendSyncTest : public testing::Test,
size_t count = 0; size_t count = 0;
base::RunLoop run_loop; base::RunLoop run_loop;
PostTaskAndReplyWithResult( PostTaskAndReplyWithResult(
worker_task_runner_, worker_task_runner_.get(),
FROM_HERE, FROM_HERE,
base::Bind(&MetadataDatabase::CountFileTracker, base::Bind(&MetadataDatabase::CountFileTracker,
base::Unretained(metadata_database())), base::Unretained(metadata_database())),
base::Bind(&SetValueAndCallClosure<size_t>, base::Bind(
run_loop.QuitClosure(), &count)); &SetValueAndCallClosure<size_t>, run_loop.QuitClosure(), &count));
run_loop.Run(); run_loop.Run();
return count; return count;
} }
......
...@@ -44,9 +44,7 @@ google_apis::CancelCallback DriveServiceOnWorker::AddNewDirectory( ...@@ -44,9 +44,7 @@ google_apis::CancelCallback DriveServiceOnWorker::AddNewDirectory(
directory_title, directory_title,
options, options,
RelayCallbackToTaskRunner( RelayCallbackToTaskRunner(
worker_task_runner_, worker_task_runner_.get(), FROM_HERE, callback)));
FROM_HERE,
callback)));
return google_apis::CancelCallback(); return google_apis::CancelCallback();
} }
...@@ -64,9 +62,7 @@ google_apis::CancelCallback DriveServiceOnWorker::DeleteResource( ...@@ -64,9 +62,7 @@ google_apis::CancelCallback DriveServiceOnWorker::DeleteResource(
resource_id, resource_id,
etag, etag,
RelayCallbackToTaskRunner( RelayCallbackToTaskRunner(
worker_task_runner_, worker_task_runner_.get(), FROM_HERE, callback)));
FROM_HERE,
callback)));
return google_apis::CancelCallback(); return google_apis::CancelCallback();
} }
...@@ -81,22 +77,17 @@ google_apis::CancelCallback DriveServiceOnWorker::DownloadFile( ...@@ -81,22 +77,17 @@ google_apis::CancelCallback DriveServiceOnWorker::DownloadFile(
ui_task_runner_->PostTask( ui_task_runner_->PostTask(
FROM_HERE, FROM_HERE,
base::Bind(&DriveServiceWrapper::DownloadFile, base::Bind(
wrapper_, &DriveServiceWrapper::DownloadFile,
local_cache_path, wrapper_,
resource_id, local_cache_path,
RelayCallbackToTaskRunner( resource_id,
worker_task_runner_, RelayCallbackToTaskRunner(
FROM_HERE, worker_task_runner_.get(), FROM_HERE, download_action_callback),
download_action_callback), RelayCallbackToTaskRunner(
RelayCallbackToTaskRunner( worker_task_runner_.get(), FROM_HERE, get_content_callback),
worker_task_runner_, RelayCallbackToTaskRunner(
FROM_HERE, worker_task_runner_.get(), FROM_HERE, progress_callback)));
get_content_callback),
RelayCallbackToTaskRunner(
worker_task_runner_,
FROM_HERE,
progress_callback)));
return google_apis::CancelCallback(); return google_apis::CancelCallback();
} }
...@@ -110,9 +101,7 @@ google_apis::CancelCallback DriveServiceOnWorker::GetAboutResource( ...@@ -110,9 +101,7 @@ google_apis::CancelCallback DriveServiceOnWorker::GetAboutResource(
base::Bind(&DriveServiceWrapper::GetAboutResource, base::Bind(&DriveServiceWrapper::GetAboutResource,
wrapper_, wrapper_,
RelayCallbackToTaskRunner( RelayCallbackToTaskRunner(
worker_task_runner_, worker_task_runner_.get(), FROM_HERE, callback)));
FROM_HERE,
callback)));
return google_apis::CancelCallback(); return google_apis::CancelCallback();
} }
...@@ -128,9 +117,7 @@ google_apis::CancelCallback DriveServiceOnWorker::GetChangeList( ...@@ -128,9 +117,7 @@ google_apis::CancelCallback DriveServiceOnWorker::GetChangeList(
wrapper_, wrapper_,
start_changestamp, start_changestamp,
RelayCallbackToTaskRunner( RelayCallbackToTaskRunner(
worker_task_runner_, worker_task_runner_.get(), FROM_HERE, callback)));
FROM_HERE,
callback)));
return google_apis::CancelCallback(); return google_apis::CancelCallback();
} }
...@@ -146,9 +133,7 @@ google_apis::CancelCallback DriveServiceOnWorker::GetRemainingChangeList( ...@@ -146,9 +133,7 @@ google_apis::CancelCallback DriveServiceOnWorker::GetRemainingChangeList(
wrapper_, wrapper_,
next_link, next_link,
RelayCallbackToTaskRunner( RelayCallbackToTaskRunner(
worker_task_runner_, worker_task_runner_.get(), FROM_HERE, callback)));
FROM_HERE,
callback)));
return google_apis::CancelCallback(); return google_apis::CancelCallback();
} }
...@@ -170,9 +155,7 @@ google_apis::CancelCallback DriveServiceOnWorker::GetRemainingFileList( ...@@ -170,9 +155,7 @@ google_apis::CancelCallback DriveServiceOnWorker::GetRemainingFileList(
wrapper_, wrapper_,
next_link, next_link,
RelayCallbackToTaskRunner( RelayCallbackToTaskRunner(
worker_task_runner_, worker_task_runner_.get(), FROM_HERE, callback)));
FROM_HERE,
callback)));
return google_apis::CancelCallback(); return google_apis::CancelCallback();
} }
...@@ -189,9 +172,7 @@ google_apis::CancelCallback DriveServiceOnWorker::GetFileResource( ...@@ -189,9 +172,7 @@ google_apis::CancelCallback DriveServiceOnWorker::GetFileResource(
wrapper_, wrapper_,
resource_id, resource_id,
RelayCallbackToTaskRunner( RelayCallbackToTaskRunner(
worker_task_runner_, worker_task_runner_.get(), FROM_HERE, callback)));
FROM_HERE,
callback)));
return google_apis::CancelCallback(); return google_apis::CancelCallback();
} }
...@@ -207,9 +188,7 @@ google_apis::CancelCallback DriveServiceOnWorker::GetFileListInDirectory( ...@@ -207,9 +188,7 @@ google_apis::CancelCallback DriveServiceOnWorker::GetFileListInDirectory(
wrapper_, wrapper_,
directory_resource_id, directory_resource_id,
RelayCallbackToTaskRunner( RelayCallbackToTaskRunner(
worker_task_runner_, worker_task_runner_.get(), FROM_HERE, callback)));
FROM_HERE,
callback)));
return google_apis::CancelCallback(); return google_apis::CancelCallback();
} }
...@@ -227,9 +206,7 @@ google_apis::CancelCallback DriveServiceOnWorker::RemoveResourceFromDirectory( ...@@ -227,9 +206,7 @@ google_apis::CancelCallback DriveServiceOnWorker::RemoveResourceFromDirectory(
parent_resource_id, parent_resource_id,
resource_id, resource_id,
RelayCallbackToTaskRunner( RelayCallbackToTaskRunner(
worker_task_runner_, worker_task_runner_.get(), FROM_HERE, callback)));
FROM_HERE,
callback)));
return google_apis::CancelCallback(); return google_apis::CancelCallback();
} }
...@@ -247,9 +224,7 @@ google_apis::CancelCallback DriveServiceOnWorker::SearchByTitle( ...@@ -247,9 +224,7 @@ google_apis::CancelCallback DriveServiceOnWorker::SearchByTitle(
title, title,
directory_resource_id, directory_resource_id,
RelayCallbackToTaskRunner( RelayCallbackToTaskRunner(
worker_task_runner_, worker_task_runner_.get(), FROM_HERE, callback)));
FROM_HERE,
callback)));
return google_apis::CancelCallback(); return google_apis::CancelCallback();
} }
......
...@@ -48,9 +48,7 @@ google_apis::CancelCallback DriveUploaderOnWorker::UploadNewFile( ...@@ -48,9 +48,7 @@ google_apis::CancelCallback DriveUploaderOnWorker::UploadNewFile(
content_type, content_type,
options, options,
RelayCallbackToTaskRunner( RelayCallbackToTaskRunner(
worker_task_runner_, worker_task_runner_.get(), FROM_HERE, callback)));
FROM_HERE,
callback)));
return google_apis::CancelCallback(); return google_apis::CancelCallback();
} }
...@@ -73,9 +71,7 @@ google_apis::CancelCallback DriveUploaderOnWorker::UploadExistingFile( ...@@ -73,9 +71,7 @@ google_apis::CancelCallback DriveUploaderOnWorker::UploadExistingFile(
content_type, content_type,
options, options,
RelayCallbackToTaskRunner( RelayCallbackToTaskRunner(
worker_task_runner_, worker_task_runner_.get(), FROM_HERE, callback)));
FROM_HERE,
callback)));
return google_apis::CancelCallback(); return google_apis::CancelCallback();
} }
......
...@@ -41,9 +41,7 @@ void RemoteChangeProcessorOnWorker::PrepareForProcessRemoteChange( ...@@ -41,9 +41,7 @@ void RemoteChangeProcessorOnWorker::PrepareForProcessRemoteChange(
wrapper_, wrapper_,
url, url,
RelayCallbackToTaskRunner( RelayCallbackToTaskRunner(
worker_task_runner_, worker_task_runner_.get(), FROM_HERE, callback)));
FROM_HERE,
callback)));
} }
void RemoteChangeProcessorOnWorker::ApplyRemoteChange( void RemoteChangeProcessorOnWorker::ApplyRemoteChange(
...@@ -61,9 +59,7 @@ void RemoteChangeProcessorOnWorker::ApplyRemoteChange( ...@@ -61,9 +59,7 @@ void RemoteChangeProcessorOnWorker::ApplyRemoteChange(
local_path, local_path,
url, url,
RelayCallbackToTaskRunner( RelayCallbackToTaskRunner(
worker_task_runner_, worker_task_runner_.get(), FROM_HERE, callback)));
FROM_HERE,
callback)));
} }
void RemoteChangeProcessorOnWorker::FinalizeRemoteSync( void RemoteChangeProcessorOnWorker::FinalizeRemoteSync(
...@@ -74,14 +70,13 @@ void RemoteChangeProcessorOnWorker::FinalizeRemoteSync( ...@@ -74,14 +70,13 @@ void RemoteChangeProcessorOnWorker::FinalizeRemoteSync(
ui_task_runner_->PostTask( ui_task_runner_->PostTask(
FROM_HERE, FROM_HERE,
base::Bind(&RemoteChangeProcessorWrapper::FinalizeRemoteSync, base::Bind(
wrapper_, &RemoteChangeProcessorWrapper::FinalizeRemoteSync,
url, wrapper_,
clear_local_changes, url,
RelayCallbackToTaskRunner( clear_local_changes,
worker_task_runner_, RelayCallbackToTaskRunner(
FROM_HERE, worker_task_runner_.get(), FROM_HERE, completion_callback)));
completion_callback)));
} }
void RemoteChangeProcessorOnWorker::RecordFakeLocalChange( void RemoteChangeProcessorOnWorker::RecordFakeLocalChange(
...@@ -97,9 +92,7 @@ void RemoteChangeProcessorOnWorker::RecordFakeLocalChange( ...@@ -97,9 +92,7 @@ void RemoteChangeProcessorOnWorker::RecordFakeLocalChange(
url, url,
change, change,
RelayCallbackToTaskRunner( RelayCallbackToTaskRunner(
worker_task_runner_, worker_task_runner_.get(), FROM_HERE, callback)));
FROM_HERE,
callback)));
} }
void RemoteChangeProcessorOnWorker::DetachFromSequence() { void RemoteChangeProcessorOnWorker::DetachFromSequence() {
......
...@@ -216,18 +216,18 @@ scoped_ptr<SyncEngine> SyncEngine::CreateForBrowserContext( ...@@ -216,18 +216,18 @@ scoped_ptr<SyncEngine> SyncEngine::CreateForBrowserContext(
context->GetRequestContext(); context->GetRequestContext();
scoped_ptr<drive_backend::SyncEngine> sync_engine( scoped_ptr<drive_backend::SyncEngine> sync_engine(
new SyncEngine(ui_task_runner, new SyncEngine(ui_task_runner.get(),
worker_task_runner, worker_task_runner.get(),
drive_task_runner, drive_task_runner.get(),
GetSyncFileSystemDir(context->GetPath()), GetSyncFileSystemDir(context->GetPath()),
task_logger, task_logger,
notification_manager, notification_manager,
extension_service, extension_service,
signin_manager, signin_manager,
token_service, token_service,
request_context, request_context.get(),
make_scoped_ptr(new DriveServiceFactory()), make_scoped_ptr(new DriveServiceFactory()),
NULL /* env_override */)); NULL /* env_override */));
sync_engine->Initialize(); sync_engine->Initialize();
return sync_engine.Pass(); return sync_engine.Pass();
...@@ -257,9 +257,10 @@ void SyncEngine::Reset() { ...@@ -257,9 +257,10 @@ void SyncEngine::Reset() {
if (drive_service_) if (drive_service_)
drive_service_->RemoveObserver(this); drive_service_->RemoveObserver(this);
DeleteSoon(FROM_HERE, worker_task_runner_, sync_worker_.Pass()); DeleteSoon(FROM_HERE, worker_task_runner_.get(), sync_worker_.Pass());
DeleteSoon(FROM_HERE, worker_task_runner_, worker_observer_.Pass()); DeleteSoon(FROM_HERE, worker_task_runner_.get(), worker_observer_.Pass());
DeleteSoon(FROM_HERE, worker_task_runner_, DeleteSoon(FROM_HERE,
worker_task_runner_.get(),
remote_change_processor_on_worker_.Pass()); remote_change_processor_on_worker_.Pass());
drive_service_wrapper_.reset(); drive_service_wrapper_.reset();
...@@ -280,9 +281,9 @@ void SyncEngine::Initialize() { ...@@ -280,9 +281,9 @@ void SyncEngine::Initialize() {
DCHECK(drive_service_factory_); DCHECK(drive_service_factory_);
scoped_ptr<drive::DriveServiceInterface> drive_service = scoped_ptr<drive::DriveServiceInterface> drive_service =
drive_service_factory_->CreateDriveService( drive_service_factory_->CreateDriveService(
token_service_, request_context_, drive_task_runner_); token_service_, request_context_.get(), drive_task_runner_.get());
scoped_ptr<drive::DriveUploaderInterface> drive_uploader( scoped_ptr<drive::DriveUploaderInterface> drive_uploader(
new drive::DriveUploader(drive_service.get(), drive_task_runner_)); new drive::DriveUploader(drive_service.get(), drive_task_runner_.get()));
InitializeInternal(drive_service.Pass(), drive_uploader.Pass(), InitializeInternal(drive_service.Pass(), drive_uploader.Pass(),
scoped_ptr<SyncWorkerInterface>()); scoped_ptr<SyncWorkerInterface>());
...@@ -317,21 +318,21 @@ void SyncEngine::InitializeInternal( ...@@ -317,21 +318,21 @@ void SyncEngine::InitializeInternal(
// between DriveService and syncers in SyncWorker. // between DriveService and syncers in SyncWorker.
scoped_ptr<drive::DriveServiceInterface> drive_service_on_worker( scoped_ptr<drive::DriveServiceInterface> drive_service_on_worker(
new DriveServiceOnWorker(drive_service_wrapper_->AsWeakPtr(), new DriveServiceOnWorker(drive_service_wrapper_->AsWeakPtr(),
ui_task_runner_, ui_task_runner_.get(),
worker_task_runner_)); worker_task_runner_.get()));
scoped_ptr<drive::DriveUploaderInterface> drive_uploader_on_worker( scoped_ptr<drive::DriveUploaderInterface> drive_uploader_on_worker(
new DriveUploaderOnWorker(drive_uploader_wrapper_->AsWeakPtr(), new DriveUploaderOnWorker(drive_uploader_wrapper_->AsWeakPtr(),
ui_task_runner_, ui_task_runner_.get(),
worker_task_runner_)); worker_task_runner_.get()));
scoped_ptr<SyncEngineContext> sync_engine_context( scoped_ptr<SyncEngineContext> sync_engine_context(
new SyncEngineContext(drive_service_on_worker.Pass(), new SyncEngineContext(drive_service_on_worker.Pass(),
drive_uploader_on_worker.Pass(), drive_uploader_on_worker.Pass(),
task_logger_, task_logger_,
ui_task_runner_, ui_task_runner_.get(),
worker_task_runner_)); worker_task_runner_.get()));
worker_observer_.reset( worker_observer_.reset(new WorkerObserver(ui_task_runner_.get(),
new WorkerObserver(ui_task_runner_, weak_ptr_factory_.GetWeakPtr())); weak_ptr_factory_.GetWeakPtr()));
base::WeakPtr<ExtensionServiceInterface> extension_service_weak_ptr; base::WeakPtr<ExtensionServiceInterface> extension_service_weak_ptr;
if (extension_service_) if (extension_service_)
...@@ -493,7 +494,8 @@ void SyncEngine::SetRemoteChangeProcessor(RemoteChangeProcessor* processor) { ...@@ -493,7 +494,8 @@ void SyncEngine::SetRemoteChangeProcessor(RemoteChangeProcessor* processor) {
remote_change_processor_on_worker_.reset(new RemoteChangeProcessorOnWorker( remote_change_processor_on_worker_.reset(new RemoteChangeProcessorOnWorker(
remote_change_processor_wrapper_->AsWeakPtr(), remote_change_processor_wrapper_->AsWeakPtr(),
ui_task_runner_, worker_task_runner_)); ui_task_runner_.get(),
worker_task_runner_.get()));
worker_task_runner_->PostTask( worker_task_runner_->PostTask(
FROM_HERE, FROM_HERE,
...@@ -548,13 +550,12 @@ void SyncEngine::DumpFiles(const GURL& origin, ...@@ -548,13 +550,12 @@ void SyncEngine::DumpFiles(const GURL& origin,
ListCallback tracked_callback = ListCallback tracked_callback =
callback_tracker_.Register(abort_closure, callback); callback_tracker_.Register(abort_closure, callback);
PostTaskAndReplyWithResult( PostTaskAndReplyWithResult(worker_task_runner_.get(),
worker_task_runner_, FROM_HERE,
FROM_HERE, base::Bind(&SyncWorkerInterface::DumpFiles,
base::Bind(&SyncWorkerInterface::DumpFiles, base::Unretained(sync_worker_.get()),
base::Unretained(sync_worker_.get()), origin),
origin), tracked_callback);
tracked_callback);
} }
void SyncEngine::DumpDatabase(const ListCallback& callback) { void SyncEngine::DumpDatabase(const ListCallback& callback) {
...@@ -569,12 +570,11 @@ void SyncEngine::DumpDatabase(const ListCallback& callback) { ...@@ -569,12 +570,11 @@ void SyncEngine::DumpDatabase(const ListCallback& callback) {
ListCallback tracked_callback = ListCallback tracked_callback =
callback_tracker_.Register(abort_closure, callback); callback_tracker_.Register(abort_closure, callback);
PostTaskAndReplyWithResult( PostTaskAndReplyWithResult(worker_task_runner_.get(),
worker_task_runner_, FROM_HERE,
FROM_HERE, base::Bind(&SyncWorkerInterface::DumpDatabase,
base::Bind(&SyncWorkerInterface::DumpDatabase, base::Unretained(sync_worker_.get())),
base::Unretained(sync_worker_.get())), tracked_callback);
tracked_callback);
} }
void SyncEngine::SetSyncEnabled(bool sync_enabled) { void SyncEngine::SetSyncEnabled(bool sync_enabled) {
......
...@@ -45,8 +45,8 @@ class SyncEngineTest : public testing::Test, ...@@ -45,8 +45,8 @@ class SyncEngineTest : public testing::Test,
base::SequencedWorkerPool::SKIP_ON_SHUTDOWN); base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
sync_engine_.reset(new drive_backend::SyncEngine( sync_engine_.reset(new drive_backend::SyncEngine(
ui_task_runner, ui_task_runner.get(),
worker_task_runner_, worker_task_runner_.get(),
NULL /* drive_task_runner */, NULL /* drive_task_runner */,
profile_dir_.path(), profile_dir_.path(),
NULL /* task_logger */, NULL /* task_logger */,
...@@ -103,7 +103,7 @@ class SyncEngineTest : public testing::Test, ...@@ -103,7 +103,7 @@ class SyncEngineTest : public testing::Test,
} }
void WaitForWorkerTaskRunner() { void WaitForWorkerTaskRunner() {
DCHECK(worker_task_runner_); DCHECK(worker_task_runner_.get());
base::RunLoop run_loop; base::RunLoop run_loop;
worker_task_runner_->PostTask( worker_task_runner_->PostTask(
......
...@@ -72,7 +72,7 @@ void SyncTaskManager::Initialize(SyncStatusCode status) { ...@@ -72,7 +72,7 @@ void SyncTaskManager::Initialize(SyncStatusCode status) {
DCHECK(sequence_checker_.CalledOnValidSequencedThread()); DCHECK(sequence_checker_.CalledOnValidSequencedThread());
DCHECK(!token_); DCHECK(!token_);
NotifyTaskDone( NotifyTaskDone(
SyncTaskToken::CreateForForegroundTask(AsWeakPtr(), task_runner_), SyncTaskToken::CreateForForegroundTask(AsWeakPtr(), task_runner_.get()),
status); status);
} }
...@@ -327,11 +327,10 @@ void SyncTaskManager::UpdateBlockingFactorBody( ...@@ -327,11 +327,10 @@ void SyncTaskManager::UpdateBlockingFactorBody(
foreground_task_token->clear_callback(); foreground_task_token->clear_callback();
background_task_token = background_task_token =
SyncTaskToken::CreateForBackgroundTask( SyncTaskToken::CreateForBackgroundTask(AsWeakPtr(),
AsWeakPtr(), task_runner_.get(),
task_runner_, task_token_seq_++,
task_token_seq_++, blocking_factor.Pass());
blocking_factor.Pass());
background_task_token->UpdateTask(from_here, callback); background_task_token->UpdateTask(from_here, callback);
running_background_tasks_.set(background_task_token->token_id(), running_background_tasks_.set(background_task_token->token_id(),
running_foreground_task_.Pass()); running_foreground_task_.Pass());
......
...@@ -68,16 +68,18 @@ SyncTaskToken::~SyncTaskToken() { ...@@ -68,16 +68,18 @@ SyncTaskToken::~SyncTaskToken() {
// it must return the token to TaskManager. // it must return the token to TaskManager.
// Destroying a token with valid |client| indicates the token was // Destroying a token with valid |client| indicates the token was
// dropped by a task without returning. // dropped by a task without returning.
if (task_runner_ && task_runner_->RunsTasksOnCurrentThread() && if (task_runner_.get() && task_runner_->RunsTasksOnCurrentThread() &&
manager_ && manager_->IsRunningTask(token_id_)) { manager_ && manager_->IsRunningTask(token_id_)) {
NOTREACHED() NOTREACHED()
<< "Unexpected TaskToken deletion from: " << location_.ToString(); << "Unexpected TaskToken deletion from: " << location_.ToString();
// Reinitializes the token. // Reinitializes the token.
SyncTaskManager::NotifyTaskDone( SyncTaskManager::NotifyTaskDone(
make_scoped_ptr(new SyncTaskToken( make_scoped_ptr(new SyncTaskToken(manager_,
manager_, task_runner_, token_id_, blocking_factor_.Pass(), task_runner_.get(),
SyncStatusCallback())), token_id_,
blocking_factor_.Pass(),
SyncStatusCallback())),
SYNC_STATUS_OK); SYNC_STATUS_OK);
} }
} }
......
...@@ -43,7 +43,7 @@ RootDeleteHelper::RootDeleteHelper( ...@@ -43,7 +43,7 @@ RootDeleteHelper::RootDeleteHelper(
callback_(callback), callback_(callback),
sync_status_(sync_status), sync_status_(sync_status),
weak_factory_(this) { weak_factory_(this) {
DCHECK(file_system_context_); DCHECK(file_system_context_.get());
DCHECK(url_.is_valid()); DCHECK(url_.is_valid());
DCHECK(!callback_.is_null()); DCHECK(!callback_.is_null());
DCHECK(sync_status_); DCHECK(sync_status_);
......
...@@ -230,7 +230,7 @@ void SyncFileSystemBackend::SetLocalFileChangeTracker( ...@@ -230,7 +230,7 @@ void SyncFileSystemBackend::SetLocalFileChangeTracker(
void SyncFileSystemBackend::set_sync_context( void SyncFileSystemBackend::set_sync_context(
LocalFileSyncContext* sync_context) { LocalFileSyncContext* sync_context) {
DCHECK(!sync_context_); DCHECK(!sync_context_.get());
sync_context_ = sync_context; sync_context_ = sync_context;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment