Commit b7de6671 authored by Ella Ge's avatar Ella Ge Committed by Chromium LUCI CQ

Convert base::Callback to base::OnceCallback in certificates_handler

make ReadCallback and WriteCallback use base::OnceCallback

Bug: 1152282
Change-Id: Ie7c52a762e04c368fbecd0ed1dcec3c0ae8ab1c0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2600384Reviewed-by: default avatarRebekah Potter <rbpotter@chromium.org>
Commit-Queue: Ella Ge <eirage@chromium.org>
Cr-Commit-Position: refs/heads/master@{#839056}
parent 35807ecd
...@@ -186,20 +186,20 @@ class FileAccessProvider ...@@ -186,20 +186,20 @@ class FileAccessProvider
public: public:
// The first parameter is 0 on success or errno on failure. The second // The first parameter is 0 on success or errno on failure. The second
// parameter is read result. // parameter is read result.
typedef base::Callback<void(const int*, const std::string*)> ReadCallback; typedef base::OnceCallback<void(const int*, const std::string*)> ReadCallback;
// The first parameter is 0 on success or errno on failure. The second // The first parameter is 0 on success or errno on failure. The second
// parameter is the number of bytes written on success. // parameter is the number of bytes written on success.
typedef base::Callback<void(const int*, const int*)> WriteCallback; typedef base::OnceCallback<void(const int*, const int*)> WriteCallback;
base::CancelableTaskTracker::TaskId StartRead( base::CancelableTaskTracker::TaskId StartRead(
const base::FilePath& path, const base::FilePath& path,
const ReadCallback& callback, ReadCallback callback,
base::CancelableTaskTracker* tracker); base::CancelableTaskTracker* tracker);
base::CancelableTaskTracker::TaskId StartWrite( base::CancelableTaskTracker::TaskId StartWrite(
const base::FilePath& path, const base::FilePath& path,
const std::string& data, const std::string& data,
const WriteCallback& callback, WriteCallback callback,
base::CancelableTaskTracker* tracker); base::CancelableTaskTracker* tracker);
private: private:
...@@ -219,7 +219,7 @@ class FileAccessProvider ...@@ -219,7 +219,7 @@ class FileAccessProvider
base::CancelableTaskTracker::TaskId FileAccessProvider::StartRead( base::CancelableTaskTracker::TaskId FileAccessProvider::StartRead(
const base::FilePath& path, const base::FilePath& path,
const ReadCallback& callback, ReadCallback callback,
base::CancelableTaskTracker* tracker) { base::CancelableTaskTracker* tracker) {
// Owned by reply callback posted below. // Owned by reply callback posted below.
int* saved_errno = new int(0); int* saved_errno = new int(0);
...@@ -232,13 +232,14 @@ base::CancelableTaskTracker::TaskId FileAccessProvider::StartRead( ...@@ -232,13 +232,14 @@ base::CancelableTaskTracker::TaskId FileAccessProvider::StartRead(
task_runner.get(), FROM_HERE, task_runner.get(), FROM_HERE,
base::BindOnce(&FileAccessProvider::DoRead, this, path, saved_errno, base::BindOnce(&FileAccessProvider::DoRead, this, path, saved_errno,
data), data),
base::BindOnce(callback, base::Owned(saved_errno), base::Owned(data))); base::BindOnce(std::move(callback), base::Owned(saved_errno),
base::Owned(data)));
} }
base::CancelableTaskTracker::TaskId FileAccessProvider::StartWrite( base::CancelableTaskTracker::TaskId FileAccessProvider::StartWrite(
const base::FilePath& path, const base::FilePath& path,
const std::string& data, const std::string& data,
const WriteCallback& callback, WriteCallback callback,
base::CancelableTaskTracker* tracker) { base::CancelableTaskTracker* tracker) {
// Owned by reply callback posted below. // Owned by reply callback posted below.
int* saved_errno = new int(0); int* saved_errno = new int(0);
...@@ -252,7 +253,7 @@ base::CancelableTaskTracker::TaskId FileAccessProvider::StartWrite( ...@@ -252,7 +253,7 @@ base::CancelableTaskTracker::TaskId FileAccessProvider::StartWrite(
task_runner.get(), FROM_HERE, task_runner.get(), FROM_HERE,
base::BindOnce(&FileAccessProvider::DoWrite, this, path, data, base::BindOnce(&FileAccessProvider::DoWrite, this, path, data,
saved_errno, bytes_written), saved_errno, bytes_written),
base::BindOnce(callback, base::Owned(saved_errno), base::BindOnce(std::move(callback), base::Owned(saved_errno),
base::Owned(bytes_written))); base::Owned(bytes_written)));
} }
...@@ -553,8 +554,8 @@ void CertificatesHandler::ExportPersonalSlotsUnlocked() { ...@@ -553,8 +554,8 @@ void CertificatesHandler::ExportPersonalSlotsUnlocked() {
} }
file_access_provider_->StartWrite( file_access_provider_->StartWrite(
file_path_, output, file_path_, output,
base::Bind(&CertificatesHandler::ExportPersonalFileWritten, base::BindOnce(&CertificatesHandler::ExportPersonalFileWritten,
base::Unretained(this)), base::Unretained(this)),
&tracker_); &tracker_);
} }
...@@ -610,8 +611,8 @@ void CertificatesHandler::ImportPersonalFileSelected( ...@@ -610,8 +611,8 @@ void CertificatesHandler::ImportPersonalFileSelected(
const base::FilePath& path) { const base::FilePath& path) {
file_access_provider_->StartRead( file_access_provider_->StartRead(
path, path,
base::Bind(&CertificatesHandler::ImportPersonalFileRead, base::BindOnce(&CertificatesHandler::ImportPersonalFileRead,
base::Unretained(this)), base::Unretained(this)),
&tracker_); &tracker_);
} }
...@@ -759,8 +760,8 @@ void CertificatesHandler::HandleImportServer(const base::ListValue* args) { ...@@ -759,8 +760,8 @@ void CertificatesHandler::HandleImportServer(const base::ListValue* args) {
void CertificatesHandler::ImportServerFileSelected(const base::FilePath& path) { void CertificatesHandler::ImportServerFileSelected(const base::FilePath& path) {
file_access_provider_->StartRead( file_access_provider_->StartRead(
path, path,
base::Bind(&CertificatesHandler::ImportServerFileRead, base::BindOnce(&CertificatesHandler::ImportServerFileRead,
base::Unretained(this)), base::Unretained(this)),
&tracker_); &tracker_);
} }
...@@ -835,8 +836,8 @@ void CertificatesHandler::HandleImportCA(const base::ListValue* args) { ...@@ -835,8 +836,8 @@ void CertificatesHandler::HandleImportCA(const base::ListValue* args) {
void CertificatesHandler::ImportCAFileSelected(const base::FilePath& path) { void CertificatesHandler::ImportCAFileSelected(const base::FilePath& path) {
file_access_provider_->StartRead( file_access_provider_->StartRead(
path, path,
base::Bind(&CertificatesHandler::ImportCAFileRead, base::BindOnce(&CertificatesHandler::ImportCAFileRead,
base::Unretained(this)), base::Unretained(this)),
&tracker_); &tracker_);
} }
......
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