Commit e1f7b222 authored by tzik's avatar tzik Committed by Commit Bot

Rewrite base::Bind to base::BindOnce with base_bind_rewriters in //chrome/browser/chromeos/arc

This is a generated CL by a clang refactoring tool at //tools/clang/base_bind_rewriters.
It rewrites base::Bind to base::BindOnce where the resulting Callback is converted to
OnceCallback immediately.
E.g.:
  base::PostTask(FROM_HERE, base::Bind(&Foo));
is rewritten to:
  base::PostTask(FROM_HERE, base::BindOnce(&Foo));

In terms of the behavior change after the rewrite, the OnceCallback
implementation moves out the bound argument to the target function, unlike
Callback.

Bug: 554299
Change-Id: Id0d8d60e6c0104d89093522a030fa05d7c50ae67
Reviewed-on: https://chromium-review.googlesource.com/517845Reviewed-by: default avatarHidehiko Abe <hidehiko@chromium.org>
Commit-Queue: Taiju Tsuiki <tzik@chromium.org>
Cr-Commit-Position: refs/heads/master@{#475796}
parent c7fa269d
......@@ -62,8 +62,8 @@ void ArcActiveDirectoryEnrollmentTokenFetcher::Fetch(
callback_ = callback;
dm_token_storage_ = base::MakeUnique<policy::DMTokenStorage>(
g_browser_process->local_state());
dm_token_storage_->RetrieveDMToken(
base::Bind(&ArcActiveDirectoryEnrollmentTokenFetcher::OnDMTokenAvailable,
dm_token_storage_->RetrieveDMToken(base::BindOnce(
&ArcActiveDirectoryEnrollmentTokenFetcher::OnDMTokenAvailable,
weak_ptr_factory_.GetWeakPtr()));
}
......@@ -220,7 +220,7 @@ void ArcActiveDirectoryEnrollmentTokenFetcher::FinalizeSamlPage(
if (close_saml_page) {
content::BrowserThread::PostTask(
content::BrowserThread::UI, FROM_HERE,
base::Bind(&chrome::CloseWebContents, browser_, web_contents,
base::BindOnce(&chrome::CloseWebContents, browser_, web_contents,
false /* add_to_history */));
}
browser_ = nullptr;
......
......@@ -213,7 +213,7 @@ net::URLRequestJob* CloseTabJob(Browser* browser,
net::NetworkDelegate* network_delegate) {
content::BrowserThread::PostTask(
content::BrowserThread::UI, FROM_HERE,
base::Bind(&TabStripModel::CloseSelectedTabs,
base::BindOnce(&TabStripModel::CloseSelectedTabs,
base::Unretained(browser->tab_strip_model())));
return nullptr;
......@@ -291,7 +291,7 @@ class ArcActiveDirectoryEnrollmentTokenFetcherBrowserTest
auto dm_token_storage = base::MakeUnique<policy::DMTokenStorage>(
g_browser_process->local_state());
dm_token_storage->StoreDMToken(
kFakeDmToken, base::Bind(
kFakeDmToken, base::BindOnce(
[](base::RunLoop* run_loop, bool success) {
EXPECT_TRUE(success);
run_loop->Quit();
......
......@@ -266,7 +266,7 @@ void ArcDownloadsWatcherService::DownloadsWatcher::OnFilePathChanged(
outstanding_task_ = true;
BrowserThread::PostDelayedTask(
BrowserThread::FILE, FROM_HERE,
base::Bind(&DownloadsWatcher::DelayBuildTimestampMap,
base::BindOnce(&DownloadsWatcher::DelayBuildTimestampMap,
weak_ptr_factory_.GetWeakPtr()),
kBuildTimestampMapDelay);
} else {
......@@ -301,7 +301,7 @@ void ArcDownloadsWatcherService::DownloadsWatcher::OnBuildTimestampMap(
}
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
base::Bind(callback_, base::Passed(std::move(string_paths))));
base::BindOnce(callback_, base::Passed(std::move(string_paths))));
if (last_notify_time_ > snapshot_time)
DelayBuildTimestampMap();
else
......@@ -339,9 +339,9 @@ void ArcDownloadsWatcherService::StartWatchingDownloads() {
watcher_ = base::MakeUnique<DownloadsWatcher>(
base::Bind(&ArcDownloadsWatcherService::OnDownloadsChanged,
weak_ptr_factory_.GetWeakPtr()));
BrowserThread::PostTask(
BrowserThread::FILE, FROM_HERE,
base::Bind(&DownloadsWatcher::Start, base::Unretained(watcher_.get())));
BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
base::BindOnce(&DownloadsWatcher::Start,
base::Unretained(watcher_.get())));
}
void ArcDownloadsWatcherService::StopWatchingDownloads() {
......
......@@ -44,7 +44,7 @@ void ArcContentFileSystemAsyncFileUtil::CreateOrOpen(
NOTIMPLEMENTED();
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
base::Bind(callback, base::Passed(base::File()), base::Closure()));
base::BindOnce(callback, base::Passed(base::File()), base::Closure()));
}
void ArcContentFileSystemAsyncFileUtil::EnsureFileExists(
......@@ -53,7 +53,8 @@ void ArcContentFileSystemAsyncFileUtil::EnsureFileExists(
const EnsureFileExistsCallback& callback) {
NOTIMPLEMENTED();
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, base::File::FILE_ERROR_FAILED, false));
FROM_HERE,
base::BindOnce(callback, base::File::FILE_ERROR_FAILED, false));
}
void ArcContentFileSystemAsyncFileUtil::CreateDirectory(
......@@ -64,7 +65,7 @@ void ArcContentFileSystemAsyncFileUtil::CreateDirectory(
const StatusCallback& callback) {
NOTIMPLEMENTED();
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, base::File::FILE_ERROR_FAILED));
FROM_HERE, base::BindOnce(callback, base::File::FILE_ERROR_FAILED));
}
void ArcContentFileSystemAsyncFileUtil::GetFileInfo(
......@@ -83,8 +84,8 @@ void ArcContentFileSystemAsyncFileUtil::ReadDirectory(
const ReadDirectoryCallback& callback) {
NOTIMPLEMENTED();
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
base::Bind(callback, base::File::FILE_ERROR_FAILED, EntryList(), false));
FROM_HERE, base::BindOnce(callback, base::File::FILE_ERROR_FAILED,
EntryList(), false));
}
void ArcContentFileSystemAsyncFileUtil::Touch(
......@@ -95,7 +96,7 @@ void ArcContentFileSystemAsyncFileUtil::Touch(
const StatusCallback& callback) {
NOTIMPLEMENTED();
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, base::File::FILE_ERROR_FAILED));
FROM_HERE, base::BindOnce(callback, base::File::FILE_ERROR_FAILED));
}
void ArcContentFileSystemAsyncFileUtil::Truncate(
......@@ -105,7 +106,7 @@ void ArcContentFileSystemAsyncFileUtil::Truncate(
const StatusCallback& callback) {
NOTIMPLEMENTED();
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, base::File::FILE_ERROR_FAILED));
FROM_HERE, base::BindOnce(callback, base::File::FILE_ERROR_FAILED));
}
void ArcContentFileSystemAsyncFileUtil::CopyFileLocal(
......@@ -117,7 +118,7 @@ void ArcContentFileSystemAsyncFileUtil::CopyFileLocal(
const StatusCallback& callback) {
NOTIMPLEMENTED();
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, base::File::FILE_ERROR_FAILED));
FROM_HERE, base::BindOnce(callback, base::File::FILE_ERROR_FAILED));
}
void ArcContentFileSystemAsyncFileUtil::MoveFileLocal(
......@@ -128,7 +129,7 @@ void ArcContentFileSystemAsyncFileUtil::MoveFileLocal(
const StatusCallback& callback) {
NOTIMPLEMENTED();
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, base::File::FILE_ERROR_FAILED));
FROM_HERE, base::BindOnce(callback, base::File::FILE_ERROR_FAILED));
}
void ArcContentFileSystemAsyncFileUtil::CopyInForeignFile(
......@@ -138,7 +139,7 @@ void ArcContentFileSystemAsyncFileUtil::CopyInForeignFile(
const StatusCallback& callback) {
NOTIMPLEMENTED();
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, base::File::FILE_ERROR_FAILED));
FROM_HERE, base::BindOnce(callback, base::File::FILE_ERROR_FAILED));
}
void ArcContentFileSystemAsyncFileUtil::DeleteFile(
......@@ -147,7 +148,7 @@ void ArcContentFileSystemAsyncFileUtil::DeleteFile(
const StatusCallback& callback) {
NOTIMPLEMENTED();
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, base::File::FILE_ERROR_FAILED));
FROM_HERE, base::BindOnce(callback, base::File::FILE_ERROR_FAILED));
}
void ArcContentFileSystemAsyncFileUtil::DeleteDirectory(
......@@ -156,7 +157,7 @@ void ArcContentFileSystemAsyncFileUtil::DeleteDirectory(
const StatusCallback& callback) {
NOTIMPLEMENTED();
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, base::File::FILE_ERROR_FAILED));
FROM_HERE, base::BindOnce(callback, base::File::FILE_ERROR_FAILED));
}
void ArcContentFileSystemAsyncFileUtil::DeleteRecursively(
......@@ -165,7 +166,7 @@ void ArcContentFileSystemAsyncFileUtil::DeleteRecursively(
const StatusCallback& callback) {
NOTIMPLEMENTED();
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, base::File::FILE_ERROR_FAILED));
FROM_HERE, base::BindOnce(callback, base::File::FILE_ERROR_FAILED));
}
void ArcContentFileSystemAsyncFileUtil::CreateSnapshotFile(
......@@ -174,7 +175,8 @@ void ArcContentFileSystemAsyncFileUtil::CreateSnapshotFile(
const CreateSnapshotFileCallback& callback) {
NOTIMPLEMENTED();
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, base::File::FILE_ERROR_FAILED,
FROM_HERE,
base::BindOnce(callback, base::File::FILE_ERROR_FAILED,
base::File::Info(), base::FilePath(),
scoped_refptr<storage::ShareableFileReference>()));
}
......
......@@ -51,7 +51,8 @@ ArcContentFileSystemFileStreamReader::~ArcContentFileSystemFileStreamReader() {
// Use the task runner to destruct |file_| after the completion of all
// in-flight operations.
task_runner_->PostTask(
FROM_HERE, base::Bind(&base::DeletePointer<base::File>, file_.release()));
FROM_HERE,
base::BindOnce(&base::DeletePointer<base::File>, file_.release()));
}
int ArcContentFileSystemFileStreamReader::Read(
......
......@@ -98,7 +98,7 @@ void ArcFileSystemOperationRunner::GetFileSize(
arc_bridge_service()->file_system(), GetFileSize);
if (!file_system_instance) {
base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
base::Bind(callback, -1));
base::BindOnce(callback, -1));
return;
}
file_system_instance->GetFileSize(url.spec(), callback);
......@@ -118,7 +118,8 @@ void ArcFileSystemOperationRunner::OpenFileToRead(
arc_bridge_service()->file_system(), OpenFileToRead);
if (!file_system_instance) {
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, base::Passed(mojo::ScopedHandle())));
FROM_HERE,
base::BindOnce(callback, base::Passed(mojo::ScopedHandle())));
return;
}
file_system_instance->OpenFileToRead(url.spec(), callback);
......@@ -139,7 +140,8 @@ void ArcFileSystemOperationRunner::GetDocument(
arc_bridge_service()->file_system(), GetDocument);
if (!file_system_instance) {
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, base::Passed(mojom::DocumentPtr())));
FROM_HERE,
base::BindOnce(callback, base::Passed(mojom::DocumentPtr())));
return;
}
file_system_instance->GetDocument(authority, document_id, callback);
......@@ -161,7 +163,7 @@ void ArcFileSystemOperationRunner::GetChildDocuments(
arc_bridge_service()->file_system(), GetChildDocuments);
if (!file_system_instance) {
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, base::nullopt));
FROM_HERE, base::BindOnce(callback, base::nullopt));
return;
}
file_system_instance->GetChildDocuments(authority, parent_document_id,
......@@ -185,7 +187,7 @@ void ArcFileSystemOperationRunner::AddWatcher(
arc_bridge_service()->file_system(), AddWatcher);
if (!file_system_instance) {
base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
base::Bind(callback, -1));
base::BindOnce(callback, -1));
return;
}
file_system_instance->AddWatcher(
......@@ -201,8 +203,8 @@ void ArcFileSystemOperationRunner::RemoveWatcher(
// RemoveWatcher() is never deferred since watchers do not persist across
// container reboots.
if (should_defer_) {
base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
base::Bind(callback, false));
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(callback, false));
return;
}
......@@ -211,8 +213,8 @@ void ArcFileSystemOperationRunner::RemoveWatcher(
// users must not assume registered callbacks are immediately invalidated.
auto iter = watcher_callbacks_.find(watcher_id);
if (iter == watcher_callbacks_.end()) {
base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
base::Bind(callback, false));
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(callback, false));
return;
}
watcher_callbacks_.erase(iter);
......@@ -220,8 +222,8 @@ void ArcFileSystemOperationRunner::RemoveWatcher(
auto* file_system_instance = ARC_GET_INSTANCE_FOR_METHOD(
arc_bridge_service()->file_system(), AddWatcher);
if (!file_system_instance) {
base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
base::Bind(callback, false));
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(callback, false));
return;
}
file_system_instance->RemoveWatcher(watcher_id, callback);
......
......@@ -24,7 +24,7 @@ void PostToIOThread(const base::Callback<void(T)>& callback, T result) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
base::Bind(callback, base::Passed(std::move(result))));
base::BindOnce(callback, base::Passed(std::move(result))));
}
void GetFileSizeOnUIThread(const GURL& url,
......@@ -156,7 +156,8 @@ void ObserverIOThreadWrapper::OnWatchersCleared() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
base::Bind(&ObserverIOThreadWrapper::OnWatchersClearedOnIOThread, this));
base::BindOnce(&ObserverIOThreadWrapper::OnWatchersClearedOnIOThread,
this));
}
void ObserverIOThreadWrapper::OnWatchersClearedOnIOThread() {
......@@ -171,7 +172,7 @@ void GetFileSizeOnIOThread(const GURL& url,
DCHECK_CURRENTLY_ON(BrowserThread::IO);
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
base::Bind(&GetFileSizeOnUIThread, url,
base::BindOnce(&GetFileSizeOnUIThread, url,
base::Bind(&PostToIOThread<int64_t>, callback)));
}
......@@ -180,7 +181,8 @@ void OpenFileToReadOnIOThread(const GURL& url,
DCHECK_CURRENTLY_ON(BrowserThread::IO);
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
base::Bind(&OpenFileToReadOnUIThread, url,
base::BindOnce(
&OpenFileToReadOnUIThread, url,
base::Bind(&PostToIOThread<mojo::ScopedHandle>, callback)));
}
......@@ -190,7 +192,8 @@ void GetDocumentOnIOThread(const std::string& authority,
DCHECK_CURRENTLY_ON(BrowserThread::IO);
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
base::Bind(&GetDocumentOnUIThread, authority, document_id,
base::BindOnce(
&GetDocumentOnUIThread, authority, document_id,
base::Bind(&PostToIOThread<mojom::DocumentPtr>, callback)));
}
......@@ -200,7 +203,7 @@ void GetChildDocumentsOnIOThread(const std::string& authority,
DCHECK_CURRENTLY_ON(BrowserThread::IO);
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
base::Bind(
base::BindOnce(
&GetChildDocumentsOnUIThread, authority, parent_document_id,
base::Bind(
&PostToIOThread<base::Optional<std::vector<mojom::DocumentPtr>>>,
......@@ -214,7 +217,7 @@ void AddWatcherOnIOThread(const std::string& authority,
DCHECK_CURRENTLY_ON(BrowserThread::IO);
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
base::Bind(
base::BindOnce(
&AddWatcherOnUIThread, authority, document_id,
base::Bind(&PostToIOThread<ArcFileSystemOperationRunner::ChangeType>,
watcher_callback),
......@@ -226,14 +229,14 @@ void RemoveWatcherOnIOThread(int64_t watcher_id,
DCHECK_CURRENTLY_ON(BrowserThread::IO);
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
base::Bind(&RemoveWatcherOnUIThread, watcher_id,
base::BindOnce(&RemoveWatcherOnUIThread, watcher_id,
base::Bind(&PostToIOThread<bool>, callback)));
}
void AddObserverOnIOThread(scoped_refptr<ObserverIOThreadWrapper> observer) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
base::Bind(&AddObserverOnUIThread, observer));
base::BindOnce(&AddObserverOnUIThread, observer));
}
void RemoveObserverOnIOThread(scoped_refptr<ObserverIOThreadWrapper> observer) {
......@@ -242,7 +245,7 @@ void RemoveObserverOnIOThread(scoped_refptr<ObserverIOThreadWrapper> observer) {
// called after this function returns.
observer->Disable();
BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
base::Bind(&RemoveObserverOnUIThread, observer));
base::BindOnce(&RemoveObserverOnUIThread, observer));
}
} // namespace file_system_operation_runner_util
......
......@@ -134,7 +134,8 @@ void ArcAndroidManagementChecker::ScheduleRetry() {
VLOG(2) << "Schedule next android management check in " << retry_delay_;
base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
FROM_HERE, base::Bind(&ArcAndroidManagementChecker::StartCheckInternal,
FROM_HERE,
base::BindOnce(&ArcAndroidManagementChecker::StartCheckInternal,
weak_ptr_factory_.GetWeakPtr()),
retry_delay_);
retry_delay_ = std::min(retry_delay_ * 2, kRetryDelayMax);
......
......@@ -273,7 +273,7 @@ void ArcProcessService::OnReceiveProcessList(
void ArcProcessService::OnInstanceReady() {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
task_runner_->PostTask(FROM_HERE, base::Bind(&Reset, nspid_to_pid_));
task_runner_->PostTask(FROM_HERE, base::BindOnce(&Reset, nspid_to_pid_));
instance_ready_ = true;
}
......
......@@ -78,8 +78,8 @@ void ArcTracingBridge::StartTracing(
if (!tracing_instance) {
// Use PostTask as the convention of TracingAgent. The caller expects
// callback to be called after this function returns.
base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
base::Bind(callback, false));
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(callback, false));
return;
}
......@@ -100,8 +100,8 @@ void ArcTracingBridge::StopTracing(const StopTracingCallback& callback) {
mojom::TracingInstance* tracing_instance =
ARC_GET_INSTANCE_FOR_METHOD(arc_bridge_service()->tracing(), StopTracing);
if (!tracing_instance) {
base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
base::Bind(callback, false));
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(callback, false));
return;
}
tracing_instance->StopTracing(callback);
......
......@@ -40,7 +40,7 @@ class VideoAcceleratorFactoryService : public mojom::VideoAcceleratorFactory {
void Create(mojom::VideoAcceleratorServiceRequest request) override {
content::BrowserThread::PostTask(
content::BrowserThread::IO, FROM_HERE,
base::Bind(&ConnectToVideoAcceleratorServiceOnIOThread,
base::BindOnce(&ConnectToVideoAcceleratorServiceOnIOThread,
base::Passed(&request)));
}
......
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